incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r1145536 - /incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollection.java
Date Tue, 12 Jul 2011 10:44:19 GMT
Author: kevin
Date: Tue Jul 12 10:44:19 2011
New Revision: 1145536

URL: http://svn.apache.org/viewvc?rev=1145536&view=rev
Log:
Fixed exception when logging message with ObjectAdapterMemento = null.

Modified:
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollection.java

Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollection.java?rev=1145536&r1=1145535&r2=1145536&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollection.java
(original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollection.java
Tue Jul 12 10:44:19 2011
@@ -105,9 +105,12 @@ public class ValueCollection extends Sca
 
             @Override
             public void setObject(final ObjectAdapterMemento adapterMemento) {
-                LOG.info("TextField: setting to: " + adapterMemento.toString());
-                pending = adapterMemento;
+                if (adapterMemento != null) {
+                    LOG.info("TextField: setting to: " + adapterMemento.toString());
+                    pending = adapterMemento;
+                }
                 if (scalarModel != null && pending != null) {
+                    LOG.info("TextField: setting to pending: " + pending.toString());
                     scalarModel.setObject(pending.getObjectAdapter());
                 }
 



Mime
View raw message