Issue #3

fix npe in JAAS submodule when no credentials provided
Internet2 · May 2, 2014 · dae05b5 · dae05b5
1 parent 669cb19
commit dae05b5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 2 deletions.
diff --git a/distribution/multi-context-broker-1.1.4.zip b/distribution/multi-context-broker-1.1.4.zip
diff --git a/mcb-project/package/multi-context-broker-1.1.3.zip b/mcb-project/package/multi-context-broker-1.1.3.zip
diff --git a/...ct/package/multi-context-broker-1.1.3.jar → ...ct/package/multi-context-broker-1.1.4.jar b/...ct/package/multi-context-broker-1.1.3.jar → ...ct/package/multi-context-broker-1.1.4.jar
diff --git a/mcb-project/package/multi-context-broker-1.1.4.zip b/mcb-project/package/multi-context-broker-1.1.4.zip
diff --git a/mcb-project/pom.xml b/mcb-project/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>edu.internet2.middleware.assurance.mcb</groupId>
     <artifactId>multi-context-broker</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
     <packaging>jar</packaging>
 
     <name>multi-context-broker</name>

diff --git a/...c/main/java/edu/internet2/middleware/assurance/mcb/authn/provider/JAASLoginSubmodule.java b/...c/main/java/edu/internet2/middleware/assurance/mcb/authn/provider/JAASLoginSubmodule.java
@@ -310,7 +310,11 @@ public void handle(final Callback[] callbacks) throws UnsupportedCallbackExcepti
                     ncb.setName(uname);
                 } else if (cb instanceof PasswordCallback) {
                     PasswordCallback pcb = (PasswordCallback) cb;
-                    pcb.setPassword(pass.toCharArray());
+                    if (pass != null) {
+                    	pcb.setPassword(pass.toCharArray());
+                    } else {
+                    	pcb.setPassword(null);
+                    }
                 }
             }
         }