You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2014/06/04 23:59:40 UTC
svn commit: r1600520 - in /uima/uimafit/trunk: ./
uimafit-core/src/main/java/org/apache/uima/fit/internal/
uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/
uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/
Author: rec
Date: Wed Jun 4 21:59:39 2014
New Revision: 1600520
URL: http://svn.apache.org/r1600520
Log:
[UIMA-3853] Compilation failure on IBM Java 8 beta 3
Modified:
uima/uimafit/trunk/ (props changed)
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/ReflectionUtil.java
uima/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java
uima/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java
Propchange: uima/uimafit/trunk/
------------------------------------------------------------------------------
Merged /uima/uimafit/branches/2.1.x:r1600328
Modified: uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/ReflectionUtil.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/ReflectionUtil.java?rev=1600520&r1=1600519&r2=1600520&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/ReflectionUtil.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/ReflectionUtil.java Wed Jun 4 21:59:39 2014
@@ -142,7 +142,8 @@ public final class ReflectionUtil {
public static boolean isAnnotationPresent(AccessibleObject aObject,
Class<? extends Annotation> aAnnotationClass) {
// First check if the desired annotation is present
- if (aObject.isAnnotationPresent(aAnnotationClass)) {
+ // UIMA-3853 workaround for IBM Java 8 beta 3
+ if (aObject.getAnnotation(aAnnotationClass) != null) {
return true;
}
@@ -163,7 +164,8 @@ public final class ReflectionUtil {
public static boolean isAnnotationPresent(Class<?> aObject,
Class<? extends Annotation> aAnnotationClass) {
// First check if the desired annotation is present
- if (aObject.isAnnotationPresent(aAnnotationClass)) {
+ // UIMA-3853 workaround for IBM Java 8 beta 3
+ if (aObject.getAnnotation(aAnnotationClass) != null) {
return true;
}
Modified: uima/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java?rev=1600520&r1=1600519&r2=1600520&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java (original)
+++ uima/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java Wed Jun 4 21:59:39 2014
@@ -59,7 +59,8 @@ public class LegacySupportPluginImpl imp
Class<? extends Annotation> aAnnotationClass) {
Class<? extends Annotation> legacyType = getLegacyType(aAnnotationClass);
if (legacyType != null) {
- return aObject.isAnnotationPresent(legacyType);
+ // UIMA-3853 workaround for IBM Java 8 beta 3
+ return aObject.getAnnotation(legacyType) != null;
}
else {
return false;
@@ -70,7 +71,8 @@ public class LegacySupportPluginImpl imp
Class<? extends Annotation> aAnnotationClass) {
Class<? extends Annotation> legacyType = getLegacyType(aAnnotationClass);
if (legacyType != null) {
- return aObject.isAnnotationPresent(legacyType);
+ // UIMA-3853 workaround for IBM Java 8 beta 3
+ return aObject.getAnnotation(legacyType) != null;
}
else {
return false;
Modified: uima/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java?rev=1600520&r1=1600519&r2=1600520&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java (original)
+++ uima/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java Wed Jun 4 21:59:39 2014
@@ -212,7 +212,8 @@ public class EnhanceMojo extends Abstrac
clazz = componentLoader.loadClass(clazzName);
// Do not process a class twice
- if (clazz.isAnnotationPresent(EnhancedClassFile.class)) {
+ // UIMA-3853 workaround for IBM Java 8 beta 3
+ if (clazz.getAnnotation(EnhancedClassFile.class) != null) {
countAlreadyEnhanced++;
getLog().debug("Class [" + clazzName + "] already enhanced");
// Remember that class was examined