hlship 2005/03/31 07:35:05
Modified: . status.xml
framework/src/java/org/apache/hivemind/impl
RegistryInfrastructureImpl.java
framework/src/test/org/apache/hivemind/parse
TestXmlResourceProcessor.java
Log:
HIVEMIND-104: Remove a potential deadlock related to the pooled service model.
Revision Changes Path
1.118 +1 -0 jakarta-hivemind/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/status.xml,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- status.xml 31 Mar 2005 00:24:52 -0000 1.117
+++ status.xml 31 Mar 2005 15:35:05 -0000 1.118
@@ -35,6 +35,7 @@
<action type="fix" dev="JC" fixes-bug="HIVEMIND-103" >Core service
implementations which implement RegistryShutdownListener are not notified for
primitive and singleton service models.</action>
<action type="update" dev="HLS"> Rename AdapterRegistry to
StrategyRegistry, and AdapterRegistryFactory to StrategyFactory, to better
reflect the relationship to the Gang-of-Four Strategy pattern.</action>
<action type="update" dev="HLS"> Make the interface attribute of
<service-point> optional, and default to the service point's id. </action>
+ <action type="fix" dev="HLS" fixes-bug="HIVEMIND-104">Remove a
potential deadlock related to the pooled service model.</action>
</release>
<release version="1.1-alpha-3" date="Mar 22 2005">
<action type="fix" dev="JC" fixes-bug="HIVEMIND-96" >Interceptors can
now be ordered by name rather than interceptor factory id.</action>
1.10 +10 -1
jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureImpl.java
Index: RegistryInfrastructureImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RegistryInfrastructureImpl.java 19 Feb 2005 11:17:17 -0000 1.9
+++ RegistryInfrastructureImpl.java 31 Mar 2005 15:35:05 -0000 1.10
@@ -319,6 +319,8 @@
coordinatorService.shutdown();
+ // TODO: Shoudl this be moved earlier?
+
_shutdown = true;
// Shutdown infrastructure items, such as proxies.
@@ -340,7 +342,14 @@
PropertyUtils.clearCache();
}
- private synchronized void checkShutdown()
+ /**
+ * Technically, this should be a synchronized method, but the _shutdown
+ * variable hardly ever changes, and the consequences are pretty minimal.
+ * See HIVEMIND-104.
+ *
+ */
+
+ private void checkShutdown()
{
if (_shutdown)
throw new
ApplicationRuntimeException(HiveMindMessages.registryShutdown());
1.4 +1 -1
jakarta-hivemind/framework/src/test/org/apache/hivemind/parse/TestXmlResourceProcessor.java
Index: TestXmlResourceProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/parse/TestXmlResourceProcessor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestXmlResourceProcessor.java 14 Mar 2005 14:58:53 -0000 1.3
+++ TestXmlResourceProcessor.java 31 Mar 2005 15:35:05 -0000 1.4
@@ -33,7 +33,7 @@
new DefaultErrorHandler());
Resource[] missingResources = new Resource[]
- { new FileResource("foo"), new URLResource(new
URL("http://www.foo.com/foo";)) };
+ { new FileResource("foo"), new URLResource(new
URL("file://MissingFile")) };
for (int i = 0; i < missingResources.length; i++)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
