[336296] fix validation of virtual attribute mappings

1 files changed, 10 insertions, 9 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConversionValue.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConversionValue.java
index aa585cb45c..d54092d149 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConversionValue.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConversionValue.java
@@ -102,14 +102,6 @@ public class JavaEclipseLinkConversionValue
 		return this.conversionValueAnnotation;
 	}
 
-	protected TextRange getDataValueTextRange(CompilationUnit astRoot) {
-		return this.conversionValueAnnotation.getDataValueTextRange(astRoot);
-	}
-
-	protected TextRange getObjectValueTextRange(CompilationUnit astRoot) {
-		return this.conversionValueAnnotation.getObjectValueTextRange(astRoot);
-	}
-
 
 	// ********** validation **********
 
@@ -134,7 +126,16 @@ public class JavaEclipseLinkConversionValue
 		}
 	}
 
+	protected TextRange getDataValueTextRange(CompilationUnit astRoot) {
+		return this.getValidationTextRange(this.conversionValueAnnotation.getDataValueTextRange(astRoot), astRoot);
+	}
+
+	protected TextRange getObjectValueTextRange(CompilationUnit astRoot) {
+		return this.getValidationTextRange(this.conversionValueAnnotation.getObjectValueTextRange(astRoot), astRoot);
+	}
+
 	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.conversionValueAnnotation.getTextRange(astRoot);
+		TextRange textRange = this.conversionValueAnnotation.getTextRange(astRoot);
+		return (textRange != null) ? textRange : this.getObjectTypeConverter().getValidationTextRange(astRoot);
 	}
 }