svn commit: r821922 - /incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java

[cw...@apache.org]

Author: cwiklik
Date: Mon Oct  5 17:08:15 2009
New Revision: 821922

URL: http://svn.apache.org/viewvc?rev=821922&view=rev
Log:
UIMA-1593 Adds check if multiple instance of AE is allowed. Catches mis-configuration between AE descriptor and deployment descriptor.

Modified:
    incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java

Modified: incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java?rev=821922&r1=821921&r2=821922&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java (original)
+++ incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java Mon Oct  5 17:08:15 2009
@@ -170,6 +170,14 @@
         if (analysisEngineMetadata == null) {
           analysisEngineMetadata = ae.getAnalysisEngineMetaData();
         }
+        //  Check if OperationalProperties allow replication of this AE. Throw exception if
+        //  the deployment descriptor says to scale the service *but* the AE descriptor's 
+        //  OperationalProperties disallow it.
+        if ( !analysisEngineMetadata.getOperationalProperties().isMultipleDeploymentAllowed() &&
+             aeInstancePool.size() >= 1 ) {
+          throw new ResourceInitializationException( UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
+                  "UIMAEE_multiple_deployment_not_allowed__WARNING", new Object[] {this.getComponentName(), ae.getMetaData().getName()});
+        }
         aeInstancePool.checkin(ae);
         if (aeInstancePool.size() == analysisEnginePoolSize) {
           try {