[Jboss-svn-commits] JBL Code SVN: r4720 - labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects

[<jbo...@li...>]

Author: wrzep
Date: 2006-06-10 15:37:45 -0400 (Sat, 10 Jun 2006)
New Revision: 4720

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java
Log:
JBLAB-603
Fixed bug: NPE when repo or issue tracker type was not specified.
Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java	2006-06-10 14:25:28 UTC (rev 4719)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java	2006-06-10 19:37:45 UTC (rev 4720)
@@ -51,8 +51,11 @@
 		String typeString = XmlTools.getAttributeValue(root, TYPE_ATTRIBUTE);
 		
 		type = JIRA_ISSUE_TRACKER;
-		if (typeString.equalsIgnoreCase(OTHER_ISSUE_TRACKER_STRING)) {
-			type = OTHER_ISSUE_TRACKER;
+		
+		if (typeString != null ) {
+			if (typeString.equalsIgnoreCase(OTHER_ISSUE_TRACKER_STRING)) {
+				type = OTHER_ISSUE_TRACKER;
+			}
 		}
 	}
 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java	2006-06-10 14:25:28 UTC (rev 4719)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java	2006-06-10 19:37:45 UTC (rev 4720)
@@ -60,12 +60,15 @@
 		
 		type = SVN_REPOSITORY; // default type is SVN
 		
-		if (typeString.equalsIgnoreCase(CVS_REPOSITORY_STRING)) {
-			type = SVN_REPOSITORY;
+		if (typeString != null) {
+		
+			if (typeString.equalsIgnoreCase(CVS_REPOSITORY_STRING)) {
+				type = SVN_REPOSITORY;
+			}
+			if (typeString.equalsIgnoreCase(OTHER_REPOSITORY_STRING)) {
+				type = OTHER_REPOSITORY;
+			}
 		}
-		if (typeString.equalsIgnoreCase(OTHER_REPOSITORY_STRING)) {
-			type = OTHER_REPOSITORY;
-		}
 	}
 
 	public short getType() {