portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r639538 - in /portals/jetspeed-2/portal/branches/JETSPEED-RELEASE-2.1-POSTRELEASE/components/page-manager: project.xml src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
Date Fri, 21 Mar 2008 04:24:48 GMT
Author: taylor
Date: Thu Mar 20 21:24:42 2008
New Revision: 639538

URL: http://svn.apache.org/viewvc?rev=639538&view=rev
Log:
backport fix -- intermittent NPEs in DBPM

Modified:
    portals/jetspeed-2/portal/branches/JETSPEED-RELEASE-2.1-POSTRELEASE/components/page-manager/project.xml
    portals/jetspeed-2/portal/branches/JETSPEED-RELEASE-2.1-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java

Modified: portals/jetspeed-2/portal/branches/JETSPEED-RELEASE-2.1-POSTRELEASE/components/page-manager/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-RELEASE-2.1-POSTRELEASE/components/page-manager/project.xml?rev=639538&r1=639537&r2=639538&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-RELEASE-2.1-POSTRELEASE/components/page-manager/project.xml
(original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-RELEASE-2.1-POSTRELEASE/components/page-manager/project.xml
Thu Mar 20 21:24:42 2008
@@ -69,6 +69,10 @@
             <id>org.apache.portals.jetspeed-2:jetspeed-profiler</id>
             <version>${jetspeed.version}</version>
         </dependency>        
+        <dependency>
+            <id>org.apache.portals.jetspeed-2:jetspeed-portal</id>
+            <version>${jetspeed.version}</version>
+        </dependency>        
         <!-- Testing only -->
         <dependency>
           <id>jetspeed-cm</id>

Modified: portals/jetspeed-2/portal/branches/JETSPEED-RELEASE-2.1-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-RELEASE-2.1-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java?rev=639538&r1=639537&r2=639538&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-RELEASE-2.1-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
(original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-RELEASE-2.1-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
Thu Mar 20 21:24:42 2008
@@ -21,6 +21,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.jetspeed.Jetspeed;
 import org.apache.jetspeed.JetspeedActions;
 import org.apache.jetspeed.om.folder.Folder;
 import org.apache.jetspeed.om.folder.FolderNotFoundException;
@@ -477,7 +478,7 @@
             // instance for this folder
             try
             {
-                return pageManager.getPageSecurity(this);
+                return getPageManager().getPageSecurity(this);
             }
             catch (NodeException ne)
             {
@@ -675,7 +676,7 @@
         {
             // use PageManager to get and cache folders
             // collection for this folder
-            return pageManager.getFolders(this);
+            return getPageManager().getFolders(this);
         }
 
         // return nodes with view access
@@ -692,7 +693,7 @@
         {
             // use PageManager to get folder instance without
             // caching the folders collection for this folder
-            return pageManager.getFolder(this, name);
+            return getPageManager().getFolder(this, name);
         }
 
         // select folder by name from cached folders collection
@@ -718,7 +719,7 @@
         {
             // use PageManager to get and cache pages
             // collection for this folder
-            return pageManager.getPages(this);
+            return getPageManager().getPages(this);
         }
 
         // return nodes with view access
@@ -735,7 +736,7 @@
         {
             // use PageManager to get page instance without
             // caching the pages collection for this folder
-            return pageManager.getPage(this, name);
+            return getPageManager().getPage(this, name);
         }
 
         // select page by name from cached pages collection
@@ -761,7 +762,7 @@
         {
             // use PageManager to get and cache links
             // collection for this folder
-            return pageManager.getLinks(this);
+            return getPageManager().getLinks(this);
         }
 
         // return nodes with view access
@@ -778,7 +779,7 @@
         {
             // use PageManager to get link instance without
             // caching the links collection for this folder
-            return pageManager.getLink(this, name);
+            return getPageManager().getLink(this, name);
         }
 
         // select link by name from cached links collection
@@ -804,7 +805,7 @@
         {
             // use PageManager to get and cache page security
             // instance for this folder
-            return pageManager.getPageSecurity(this);
+            return getPageManager().getPageSecurity(this);
         }
         if (pageSecurity == null)
         {
@@ -827,7 +828,7 @@
         {
             // use PageManager to get and cache all nodes
             // collection for this folder
-            return pageManager.getAll(this);
+            return getPageManager().getAll(this);
         }
 
         // return nodes with view access
@@ -1095,4 +1096,14 @@
         }
         return nodes;
     }
+    
+    public PageManager getPageManager()
+    {
+        if(pageManager == null)
+        {
+            pageManager = (PageManager)Jetspeed.getComponentManager().getComponent("PageManager");
+        }        
+        return pageManager;
+    }     
+    
 }



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