You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/02/24 14:55:14 UTC

svn commit: r1661952 - in /openmeetings: branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java

Author: solomax
Date: Tue Feb 24 13:55:13 2015
New Revision: 1661952

URL: http://svn.apache.org/r1661952
Log:
[OPENMEETINGS-1183] 'boolean' room parameters are now modifiable via SOAP

Modified:
    openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
    openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java

Modified: openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1661952&r1=1661951&r2=1661952&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java Tue Feb 24 13:55:13 2015
@@ -2133,9 +2133,11 @@ public class RoomWebService {
 				Class<?> valueClass = rw.getPropertyType(paramName);
 				Object val = null;
 				//don't like this code
-				if (valueClass.isAssignableFrom(String.class)) {
+				if (valueClass == null) {
+					//do nothing
+				} else if (valueClass.isAssignableFrom(String.class)) {
 					val = paramValue;
-				} else if (valueClass.isAssignableFrom(Boolean.class)) {
+				} else if (valueClass.isAssignableFrom(Boolean.class) || valueClass.isAssignableFrom(boolean.class)) {
 					val = Boolean.parseBoolean(paramValue);
 				} else if (valueClass.isAssignableFrom(RoomType.class)) {
 					val = roomTypeDao.get(Long.parseLong(paramValue));

Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1661952&r1=1661951&r2=1661952&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java Tue Feb 24 13:55:13 2015
@@ -2139,7 +2139,7 @@ public class RoomWebService {
 					//do nothing
 				} else if (valueClass.isAssignableFrom(String.class)) {
 					val = paramValue;
-				} else if (valueClass.isAssignableFrom(Boolean.class)) {
+				} else if (valueClass.isAssignableFrom(Boolean.class) || valueClass.isAssignableFrom(boolean.class)) {
 					val = Boolean.parseBoolean(paramValue);
 				} else if (valueClass.isAssignableFrom(RoomType.class)) {
 					val = roomTypeDao.get(Long.parseLong(paramValue));