[Wonder-cvs] SF.net SVN: wonder:[9466] trunk/Wonder/Frameworks/WOAdaptors/ERIMAdaptor/ Sources/er/imadaptor/components/IMTextAction.java

[<ms...@us...>]

Revision: 9466
          http://wonder.svn.sourceforge.net/wonder/?rev=9466&view=rev
Author:   mschrag
Date:     2009-06-09 20:33:16 +0000 (Tue, 09 Jun 2009)

Log Message:
-----------
WONDER-304 fixes a null pointer

Modified Paths:
--------------
    trunk/Wonder/Frameworks/WOAdaptors/ERIMAdaptor/Sources/er/imadaptor/components/IMTextAction.java

Modified: trunk/Wonder/Frameworks/WOAdaptors/ERIMAdaptor/Sources/er/imadaptor/components/IMTextAction.java
===================================================================
--- trunk/Wonder/Frameworks/WOAdaptors/ERIMAdaptor/Sources/er/imadaptor/components/IMTextAction.java	2009-06-09 20:26:56 UTC (rev 9465)
+++ trunk/Wonder/Frameworks/WOAdaptors/ERIMAdaptor/Sources/er/imadaptor/components/IMTextAction.java	2009-06-09 20:33:16 UTC (rev 9466)
@@ -26,7 +26,7 @@
 		WOComponent component = context.component();
 		String message = InstantMessengerAdaptor.message(request);
 		boolean allowBlanks = (_allowBlanks != null && ((Boolean) _allowBlanks.valueInComponent(component)).booleanValue());
-		if (allowBlanks || (message != null || message.trim().length() > 0)) {
+		if (allowBlanks || (message != null && message.trim().length() > 0)) {
 			_value.setValue(message, component);
 		}
 		else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.