portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r645884 - /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
Date Tue, 08 Apr 2008 12:49:17 GMT
Author: ddam
Date: Tue Apr  8 05:49:16 2008
New Revision: 645884

URL: http://svn.apache.org/viewvc?rev=645884&view=rev
Log:
fix possible race condition with portlet application monitor access

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java?rev=645884&r1=645883&r2=645884&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
Tue Apr  8 05:49:16 2008
@@ -1063,13 +1063,9 @@
             return false;
         }
         
-        private void checkDescriptorChanges()
+        private synchronized void checkDescriptorChanges()
         {
-            int size;
-            synchronized (this)
-            {
-                size = monitorInfos.size();
-            }
+            int size = monitorInfos.size();
 
         	if (log.isDebugEnabled())
             {
@@ -1079,8 +1075,7 @@
             for (int i = size-1; i > -1; i--)
             {
                 DescriptorChangeMonitorInfo monitorInfo;
-                synchronized (this)
-                {
+                
                     if ( started )
                     {
                         monitorInfo = (DescriptorChangeMonitorInfo)monitorInfos.get(i);
@@ -1143,7 +1138,6 @@
                         }
                     }
                 }
-            }
         }
     }
 



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