You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2011/01/14 09:43:11 UTC
svn commit: r1058895 - in
/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/command:
AddUserCommandHandler.java ChangeUserPasswordCommandHandler.java
Author: ngn
Date: Fri Jan 14 08:43:10 2011
New Revision: 1058895
URL: http://svn.apache.org/viewvc?rev=1058895&view=rev
Log:
Fixed NPE if accountjid was not provided by client
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/command/AddUserCommandHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/command/ChangeUserPasswordCommandHandler.java
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/command/AddUserCommandHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/command/AddUserCommandHandler.java?rev=1058895&r1=1058894&r2=1058895&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/command/AddUserCommandHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/command/AddUserCommandHandler.java Fri Jan 14 08:43:10 2011
@@ -73,11 +73,14 @@ public class AddUserCommandHandler exten
}
final DataFormParser dataFormParser = new DataFormParser(commandElements.get(0));
final Map<String,Object> valueMap = dataFormParser.extractFieldValues();
+
final Entity accountjid;
if(valueMap.get("accountjid") instanceof Entity) {
accountjid = (Entity) valueMap.get("accountjid");
- } else {
+ } else if(valueMap.get("accountjid") != null) {
accountjid = EntityImpl.parseUnchecked((String) valueMap.get("accountjid"));
+ } else {
+ accountjid = null;
}
final String password = (String)valueMap.get("password");
final String password2 = (String)valueMap.get("password-verify");
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/command/ChangeUserPasswordCommandHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/command/ChangeUserPasswordCommandHandler.java?rev=1058895&r1=1058894&r2=1058895&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/command/ChangeUserPasswordCommandHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/command/ChangeUserPasswordCommandHandler.java Fri Jan 14 08:43:10 2011
@@ -80,8 +80,10 @@ public class ChangeUserPasswordCommandHa
final Entity accountjid;
if(valueMap.get("accountjid") instanceof Entity) {
accountjid = (Entity) valueMap.get("accountjid");
- } else {
+ } else if(valueMap.get("accountjid") != null) {
accountjid = EntityImpl.parseUnchecked((String) valueMap.get("accountjid"));
+ } else {
+ accountjid = null;
}
final String password = (String)valueMap.get("password");
final String password2 = (String)valueMap.get("password-verify");