You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2007/02/07 23:06:42 UTC
svn commit: r504713 - in
/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm:
container/ container/deployer/ container/deployer/vinci/ engine/ utils/
Author: schor
Date: Wed Feb 7 14:06:41 2007
New Revision: 504713
URL: http://svn.apache.org/viewvc?view=rev&rev=504713
Log:
UIMA-284 replace wait objects which were potentially sharable
0-length strings with unique objects that are also "final".
Modified:
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/DebugControlThread.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ExpirationTimer.java
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java?view=diff&rev=504713&r1=504712&r2=504713
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java Wed Feb 7 14:06:41 2007
@@ -146,7 +146,7 @@
private boolean singleFencedInstance = false;
- private String monitor = "";
+ private final Object monitor = new Object();
private String processorName = null;
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java?view=diff&rev=504713&r1=504712&r2=504713
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java Wed Feb 7 14:06:41 2007
@@ -110,7 +110,7 @@
org.apache.uima.collection.impl.cpm.Constants.CONTENT_TAG,
org.apache.uima.collection.impl.cpm.Constants.CONTENT_TAG_VALUE, contentTag, true);
- private String monitor = "";
+ private final Object monitor = new Object();
public VinciTAP() {
}
@@ -1328,7 +1328,7 @@
*/
private void waitForServiceShutdown() {
int retry = 10; // Hard-coded limit.
- String monitor = "";
+ Object monitor = new Object();
// Try until the endpoint is closed by the service OR hard limit of tries
// has beed exceeded.
do {
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java?view=diff&rev=504713&r1=504712&r2=504713
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java Wed Feb 7 14:06:41 2007
@@ -128,11 +128,11 @@
private CPEFactory cpeFactory = null;
- private String monitor = "";
+ private final Object monitor = new Object(); // must be unique object, used for synch
private ArrayList currentServiceList = null;
- private String locMonitor = "";
+ private final Object locMonitor = new Object(); // must be unique object, used for synch
/**
* Instantiaes the class and gives it access to CPE configuration.
@@ -1860,7 +1860,7 @@
}
waitCount = MAX_WAIT_TRIES; // restore default
}
- String localMonitor = "";
+ Object localMonitor = new Object();
if (UIMAFramework.getLogger().isLoggable(Level.INFO)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.INFO, this.getClass().getName(),
"initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_got_port_from_queue__INFO",
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java?view=diff&rev=504713&r1=504712&r2=504713
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java Wed Feb 7 14:06:41 2007
@@ -108,7 +108,7 @@
public CPECasPool casPool;
// Used internally for synchronization
- public String monitor = "";
+ public final Object monitor = new Object();
// CollectionReader to be used by this CPM
private BaseCollectionReader collectionReader = null;
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/DebugControlThread.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/DebugControlThread.java?view=diff&rev=504713&r1=504712&r2=504713
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/DebugControlThread.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/DebugControlThread.java Wed Feb 7 14:06:41 2007
@@ -41,7 +41,7 @@
private boolean pause = false;
- private String monitor = "";
+ private final Object monitor = new Object();
// private boolean isRunning = false;
private CPMEngine cpm = null;
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ExpirationTimer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ExpirationTimer.java?view=diff&rev=504713&r1=504712&r2=504713
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ExpirationTimer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ExpirationTimer.java Wed Feb 7 14:06:41 2007
@@ -36,7 +36,7 @@
private String key = "";
- private String monitor = "";
+ private final Object monitor = new Object();
CPMEngine cpm = null;