[java-shib-shared] branch main updated: Fix NPE.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-shib-shared.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=6b03bcd7476a728c7da0968a7b95a9aaf0fbd2e4

The following commit(s) were added to refs/heads/main by this push:
     new 6b03bcd7 Fix NPE.
6b03bcd7 is described below

commit 6b03bcd7476a728c7da0968a7b95a9aaf0fbd2e4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 13 11:04:30 2022 -0400

    Fix NPE.
---
 .../ext/spring/util/RelocatedBeanFactoryPostProcessor.java         | 7 +++++++
 .../test/resources/net/shibboleth/ext/spring/util/relocated.xml    | 5 +----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/RelocatedBeanFactoryPostProcessor.java b/shib-spring/src/main/java/net/shibboleth/ext/spring/util/RelocatedBeanFactoryPostProcessor.java
index 18b5f810..3d68b202 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/RelocatedBeanFactoryPostProcessor.java
+++ b/shib-spring/src/main/java/net/shibboleth/ext/spring/util/RelocatedBeanFactoryPostProcessor.java
@@ -17,6 +17,7 @@
 
 package net.shibboleth.ext.spring.util;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -46,6 +47,12 @@ public class RelocatedBeanFactoryPostProcessor implements BeanFactoryPostProcess
     /** Relocated beans. */
     @Nonnull @NonnullElements private Map<String,String> movedBeans;
 
+    /** Constructor. */
+    public RelocatedBeanFactoryPostProcessor() {
+        movedClasses = Collections.emptyMap();
+        movedBeans = Collections.emptyMap();
+    }
+    
     /**
      * Set class names to rewrite.
      * 
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/relocated.xml b/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/relocated.xml
index fe34c3ca..0628d6b1 100644
--- a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/relocated.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/relocated.xml
@@ -6,10 +6,7 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
+                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <bean class="net.shibboleth.ext.spring.util.RelocatedBeanFactoryPostProcessor">
         <property name="classes">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.