[utilities COMMIT] /spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java

[noreply at shibboleth.net]

Author: rdw
Date: Mon Mar 31 08:45:54 2014
New Revision: 554

URL: http://svn.shibboleth.net/view/utilities?rev=554&view=rev
Log:
IDP388 Bug fixing.  based on experience of wiring the SVN resource into OpenSAML from the real parser

Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java?rev=554&r1=553&r2=554&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java Mon Mar 31 08:45:54 2014
@@ -238,6 +238,7 @@
             newRevision = checkoutResourceDirectory();
         } else {
             if (retrievalRevision != SVNRevision.HEAD) {
+                lastModified = getLastModificationForRevision(SVNRevision.HEAD);
                 log.debug("Working copy exists and version is pegged at {}, no need to update",
                         retrievalRevision.toString());
                 return;
@@ -435,7 +436,10 @@
 
     /** {@inheritDoc} */
     @Override public void setBeanName(String name) {
-        setId(name);
+        // For some reason Spring will call this after initialization.
+        if (!isInitialized()) {
+            setId(name);
+        }
     }
 
     /** Simple {@link ISVNStatusHandler} implementation that just stores and returns the status. */