incubator-ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ange...@apache.org
Subject svn commit: r999272 - in /incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository: impl/RepositoryObjectImpl.java stateful/impl/StatefulGatewayObjectImpl.java stateful/impl/StatefulGatewayRepositoryImpl.java
Date Tue, 21 Sep 2010 08:41:36 GMT
Author: angelos
Date: Tue Sep 21 08:41:35 2010
New Revision: 999272

URL: http://svn.apache.org/viewvc?rev=999272&view=rev
Log:
Switched the order in which repository objects check their busy- and deleted states: if stale
references to objects get used, these could end up in an infinite wait because the object
thinks it is busy.

Modified:
    incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryObjectImpl.java
    incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayObjectImpl.java
    incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java

Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryObjectImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryObjectImpl.java?rev=999272&r1=999271&r2=999272&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryObjectImpl.java
(original)
+++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryObjectImpl.java
Tue Sep 21 08:41:35 2010
@@ -13,7 +13,6 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-
 import org.apache.ace.client.repository.Associatable;
 import org.apache.ace.client.repository.Association;
 import org.apache.ace.client.repository.RepositoryObject;
@@ -547,8 +546,8 @@ public class RepositoryObjectImpl<T exte
     }
 
     void ensureCurrent() {
+    	ensureNotDeleted();
         ensureNotBusy();
-        ensureNotDeleted();
     }
 
     public String getDefinition() {

Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayObjectImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayObjectImpl.java?rev=999272&r1=999271&r2=999272&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayObjectImpl.java
(original)
+++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayObjectImpl.java
Tue Sep 21 08:41:35 2010
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Properties;
+
 import org.apache.ace.client.repository.Associatable;
 import org.apache.ace.client.repository.Association;
 import org.apache.ace.client.repository.object.ArtifactObject;

Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java?rev=999272&r1=999271&r2=999272&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java
(original)
+++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java
Tue Sep 21 08:41:35 2010
@@ -30,6 +30,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.ace.client.repository.RepositoryAdmin;
 import org.apache.ace.client.repository.RepositoryObject;
 import org.apache.ace.client.repository.RepositoryUtil;



Mime
View raw message