You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by et...@apache.org on 2008/05/26 11:43:48 UTC
svn commit: r660148 -
/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java
Author: etnu
Date: Mon May 26 02:43:47 2008
New Revision: 660148
URL: http://svn.apache.org/viewvc?rev=660148&view=rev
Log:
Corrected parent configuration for the empty case.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java?rev=660148&r1=660147&r2=660148&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java Mon May 26 02:43:47 2008
@@ -235,11 +235,7 @@
return;
}
- String parent = base.optString(PARENT_KEY);
- if (parent == null) {
- parent = DEFAULT_CONTAINER;
- }
-
+ String parent = base.optString(PARENT_KEY, DEFAULT_CONTAINER);
JSONObject parentData = config.get(parent);
if (parentData == null) {
throw new GadgetException(GadgetException.Code.INVALID_CONFIG,