svn commit: r1580053 - /uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java

[sc...@apache.org]

Author: schor
Date: Fri Mar 21 21:08:10 2014
New Revision: 1580053

URL: http://svn.apache.org/r1580053
Log:
no Jira - reformat slightly, handle a null in an error message, make some things final, and move one test outside of a try block.

Modified:
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java?rev=1580053&r1=1580052&r2=1580053&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java Fri Mar 21 21:08:10 2014
@@ -162,7 +162,7 @@ public class PrimitiveAnalysisEngine_imp
       resetResultSpecificationToDefault();
 
       logger.logrb(Level.CONFIG, CLASS_NAME.getName(), "initialize", LOG_RESOURCE_BUNDLE,
-              "UIMA_analysis_engine_init_successful__CONFIG", md.getName());
+              "UIMA_analysis_engine_init_successful__CONFIG", md != null ? md.getName(): "null");
       return true;
     } catch (ResourceConfigurationException e) {
       throw new ResourceInitializationException(
@@ -183,8 +183,7 @@ public class PrimitiveAnalysisEngine_imp
   protected void initializeAnalysisComponent(Map<String, Object> aAdditionalParams)
           throws ResourceInitializationException {
     // instantiate Annotator class
-    String annotatorClassName;
-    annotatorClassName = mDescription.getImplementationName();
+    final String annotatorClassName = mDescription.getImplementationName();
 
     if (annotatorClassName == null || annotatorClassName.length() == 0) {
       throw new ResourceInitializationException(
@@ -196,7 +195,7 @@ public class PrimitiveAnalysisEngine_imp
     Class<?> annotatorClass = null;
     try {
       // get UIMA extension ClassLoader if available
-      ClassLoader cl = getUimaContextAdmin().getResourceManager().getExtensionClassLoader();
+      final ClassLoader cl = getUimaContextAdmin().getResourceManager().getExtensionClassLoader();
 
       if (cl != null) {
         // use UIMA extension ClassLoader to load the class
@@ -567,9 +566,10 @@ public class PrimitiveAnalysisEngine_imp
      */
     public boolean hasNext() throws AnalysisEngineProcessException {
       enterProcess();
+      if (casAvailable) {
+        return true;
+      }
       try {
-        if (casAvailable)
-          return true;
         casAvailable = mMyAnalysisComponent.hasNext();
         if (!casAvailable) {
           //when hasNext returns false, by contract the AnalysisComponent is done processing its