[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src: main/java/net/shibboleth/idp/profile/spring/resourc...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Apr  9 09:00:40 2015
New Revision: 7476

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7476&view=rev
Log:
IDP-695 Handle absent "revision" attribute

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/resource/SVNResourceParser.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnEntity.xml

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/resource/SVNResourceParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/resource/SVNResourceParser.java?rev=7476&r1=7475&r2=7476&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/resource/SVNResourceParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/resource/SVNResourceParser.java Thu Apr  9 09:00:40 2015
@@ -128,7 +128,13 @@
 
         builder.addConstructorArgValue(getAttribute(element, WORKING_COPY_DIR_ATTRIB_NAME, parserContext));
 
-        builder.addConstructorArgValue(getAttribute(element, REVISION_ATTRIB_NAME, parserContext));
+        final String revision = StringSupport.trimOrNull(getAttribute(element, REVISION_ATTRIB_NAME, parserContext));
+        
+        if (null == revision) {
+            builder.addConstructorArgValue(-1);
+        } else{
+            builder.addConstructorArgValue(revision);
+        }
 
         builder.addConstructorArgValue(getAttribute(element, RESOURCE_FILE_ATTRIB_NAME, parserContext));
     }

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnEntity.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnEntity.xml?rev=7476&r1=7475&r2=7476&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnEntity.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnEntity.xml Thu Apr  9 09:00:40 2015
@@ -11,8 +11,7 @@
 
     <metadata:MetadataResource xsi:type="resource:SVNResource" resourceFile="entity.xml"
     repositoryURL="https://svn.shibboleth.net/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/"
-    workingCopyDirectory="%{TMPDIR}/svn"
-    revision="5634"/>
+    workingCopyDirectory="%{TMPDIR}/svn" />
     
 
 </metadata:MetadataProvider>