You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2011/10/27 15:46:07 UTC
svn commit: r1189758 -
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
Author: lofwyr
Date: Thu Oct 27 13:46:06 2011
New Revision: 1189758
URL: http://svn.apache.org/viewvc?rev=1189758&view=rev
Log:
prevent potential NullPointerException
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java?rev=1189758&r1=1189757&r2=1189758&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java Thu Oct 27 13:46:06 2011
@@ -191,8 +191,10 @@ public final class Markup implements Ser
} else {
// this part is not optimized, but it will be used rarely, in the moment...
Markup result = this;
- for (String summand : markup.values) {
- result = result.add(summand);
+ if (markup.values != null) {
+ for (String summand : markup.values) {
+ result = result.add(summand);
+ }
}
return result;
}