portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r911485 - /portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java
Date Thu, 18 Feb 2010 16:48:07 GMT
Author: woonsan
Date: Thu Feb 18 16:48:06 2010
New Revision: 911485

URL: http://svn.apache.org/viewvc?rev=911485&view=rev
Log:
JS2-1107: fixing a small problem in checking emptiness

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java?rev=911485&r1=911484&r2=911485&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java
Thu Feb 18 16:48:06 2010
@@ -1397,7 +1397,7 @@
                     fragmentConstraints.setOwner(constraintsOwner);
                 }
                 List constraintsConstraints = constraints.getSecurityConstraints();
-                if ((constraintsConstraints != null) || !constraintsConstraints.isEmpty())
+                if ((constraintsConstraints != null) && !constraintsConstraints.isEmpty())
                 {
                     List fragmentConstraintsConstraints = new ArrayList(constraintsConstraints.size());
                     Iterator constraintsIter = constraintsConstraints.iterator();
@@ -1414,7 +1414,7 @@
                     fragmentConstraints.setSecurityConstraints(fragmentConstraintsConstraints);
                 }
                 List constraintsConstraintsRefs = constraints.getSecurityConstraintsRefs();
-                if ((constraintsConstraintsRefs != null) || !constraintsConstraintsRefs.isEmpty())
+                if ((constraintsConstraintsRefs != null) && !constraintsConstraintsRefs.isEmpty())
                 {
                     List fragmentConstraintsConstraintsRefs = new ArrayList(constraintsConstraintsRefs.size());
                     Iterator constraintsRefsIter = constraintsConstraintsRefs.iterator();



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message