portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smi...@apache.org
Subject svn commit: r595429 - /portals/jetspeed-2/branches/JETSPEED-2.1.3/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java
Date Thu, 15 Nov 2007 20:20:50 GMT
Author: smilek
Date: Thu Nov 15 12:20:41 2007
New Revision: 595429

URL: http://svn.apache.org/viewvc?rev=595429&view=rev
Log:
added getAllNodes signature for folderExistenceRequired flag

Modified:
    portals/jetspeed-2/branches/JETSPEED-2.1.3/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java?rev=595429&r1=595428&r2=595429&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java
(original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java
Thu Nov 15 12:20:41 2007
@@ -424,7 +424,7 @@
         }
 
         // get pageSecurity
-        PageSecurity pageSecurity = (PageSecurity) getAllNodes().subset(PageSecurity.DOCUMENT_TYPE).get(PageSecurity.DOCUMENT_TYPE);
+        PageSecurity pageSecurity = (PageSecurity) getAllNodes( false ).subset(PageSecurity.DOCUMENT_TYPE).get(PageSecurity.DOCUMENT_TYPE);
         if (pageSecurity == null)
         {
             throw new DocumentNotFoundException("Jetspeed PSML page security not found: "
+ PageSecurity.DOCUMENT_TYPE);
@@ -502,7 +502,12 @@
      * @return all nodes immediatley under this
      * @throws DocumentException
      */
-    public synchronized NodeSet getAllNodes() throws DocumentException
+    public NodeSet getAllNodes() throws DocumentException
+    {
+    	return getAllNodes( true );
+    }
+    
+    protected synchronized NodeSet getAllNodes( boolean folderExistenceRequired ) throws
DocumentException
     {
         if((allNodes == null) && (folderHandler != null))
         {            
@@ -574,7 +579,10 @@
             }
             catch (FolderNotFoundException fnfe)
             {
-                log.error("getAllNodes() unexpected missing folder", fnfe);
+            	if ( folderExistenceRequired )
+            	{
+            		log.error( "getAllNodes() unexpected missing folder: " + getPath(), fnfe );
+            	}
             }
         }
         



---------------------------------------------------------------------
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