You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/05/12 21:58:24 UTC

svn commit: r405849 - in /incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website: actions/WebsiteFormAction.java formbeans/WebsiteFormEx.java

Author: snoopdave
Date: Fri May 12 12:58:22 2006
New Revision: 405849

URL: http://svn.apache.org/viewcvs?rev=405849&view=rev
Log:
JDK1.5 vs 1.4 issue

Modified:
    incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java
    incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java

Modified: incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java?rev=405849&r1=405848&r2=405849&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java (original)
+++ incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java Fri May 12 12:58:22 2006
@@ -177,7 +177,7 @@
                     umgr.saveWebsite(wd);  
                     
                     // ROL-1050: apply comment defaults to existing entries
-                    if (form.getApplyCommentDefaults()) {
+                    if (form.getApplyCommentDefaults() != null && form.getApplyCommentDefaults().booleanValue()) {
                         wmgr.applyCommentDefaultsToEntries(wd);
                     }
 

Modified: incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java?rev=405849&r1=405848&r2=405849&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java (original)
+++ incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java Fri May 12 12:58:22 2006
@@ -38,7 +38,7 @@
     private String bloggerCategoryId;
     private String defaultCategoryId;
     private String[] defaultPluginsArray;
-    private Boolean applyCommentDefaults = false;
+    private Boolean applyCommentDefaults = Boolean.FALSE;
     
     /**
      * @return Returns the bloggerCategoryId.
@@ -183,7 +183,7 @@
             javax.servlet.ServletRequest request) {
         doReset(mapping, request);
         defaultPluginsArray = new String[0];
-        applyCommentDefaults = false;
+        applyCommentDefaults = Boolean.FALSE;
     }
     
     public void reset(
@@ -191,7 +191,7 @@
             javax.servlet.http.HttpServletRequest request) {
         doReset(mapping, request);
         defaultPluginsArray = new String[0];
-        applyCommentDefaults = false;
+        applyCommentDefaults = Boolean.FALSE;
     }
     
 }