You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2012/10/26 16:15:11 UTC
svn commit: r1402523 -
/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
Author: rgodfrey
Date: Fri Oct 26 14:15:11 2012
New Revision: 1402523
URL: http://svn.apache.org/viewvc?rev=1402523&view=rev
Log:
PROTON-103 : Fix NPE in Sasl getRemoteMechanisms
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java?rev=1402523&r1=1402522&r2=1402523&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java (original)
+++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java Fri Oct 26 14:15:11 2012
@@ -296,16 +296,23 @@ public class SaslImpl implements Sasl, S
{
if(_role == Role.SERVER)
{
- return new String[] { _chosenMechanism.toString() };
+ return _chosenMechanism == null ? new String[0] : new String[] { _chosenMechanism.toString() };
}
else if(_role == Role.CLIENT)
{
- String[] remoteMechanisms = new String[_mechanisms.length];
- for(int i = 0; i < _mechanisms.length; i++)
+ if(_mechanisms == null)
{
- remoteMechanisms[i] = _mechanisms[i].toString();
+ return new String[0];
+ }
+ else
+ {
+ String[] remoteMechanisms = new String[_mechanisms.length];
+ for(int i = 0; i < _mechanisms.length; i++)
+ {
+ remoteMechanisms[i] = _mechanisms[i].toString();
+ }
+ return remoteMechanisms;
}
- return remoteMechanisms;
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org