[jboss-svn-commits] JBL Code SVN: r35146 - labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav.

[jboss-svn-commits at lists.jboss.org]

Author: dennyxu
Date: 2010-09-15 01:54:37 -0400 (Wed, 15 Sep 2010)
New Revision: 35146

Modified:
   labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavClient.java
Log:
GUVNOR-610: merge the fix to the branch 5.1.x

Modified: labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavClient.java
===================================================================
--- labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavClient.java	2010-09-15 05:42:47 UTC (rev 35145)
+++ labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavClient.java	2010-09-15 05:54:37 UTC (rev 35146)
@@ -133,10 +133,14 @@
 				if (val != null) {
 					ResourceProperties resProps = props.get(oneKey);
 					StringTokenizer tokens = new StringTokenizer(val, ","); //$NON-NLS-1$
-					String dateStamp = tokens.nextToken();
-					String revision = tokens.nextToken();
-					resProps.setLastModifiedDate(dateStamp);
-					resProps.setRevision(revision);
+//					String dateStamp = tokens.nextToken();
+//					String revision = tokens.nextToken();
+					if(tokens.hasMoreElements()){
+						resProps.setLastModifiedDate(tokens.nextToken());
+					}
+					if(tokens.hasMoreElements()){
+						resProps.setRevision(tokens.nextToken());
+					}
 				} 
 			}
 		} finally {
@@ -200,10 +204,14 @@
 			String val = guvProps.getProperty(filename);
 			if (val != null) {
 				StringTokenizer tokens = new StringTokenizer(val, ","); //$NON-NLS-1$
-				String dateStamp = tokens.nextToken();
-				String revision = tokens.nextToken();
-				props.setLastModifiedDate(dateStamp);
-				props.setRevision(revision);
+//				String dateStamp = tokens.nextToken();
+//				String revision = tokens.nextToken();
+				if(tokens.hasMoreElements()){
+					props.setLastModifiedDate(tokens.nextToken());
+				}
+				if(tokens.hasMoreElements()){
+					props.setRevision(tokens.nextToken());
+				}
 			} else {
 				Exception nfe = new Exception("Failed to get Guvnor properties for " + filename); //$NON-NLS-1$
 				Activator.getDefault().writeLog(IStatus.WARNING, nfe.getMessage(), nfe);