Merge pull request #16487 from OpenLiberty/revert-15973-ValidateVisit…

…orELSupport Revert "Validate visitor el support"
OpenLiberty · Apr 6, 2021 · fbb76c1 · fbb76c1
2 parents a4d7e0b + 6f8f200
commit fbb76c1
Show file tree

Hide file tree

Showing 7 changed files with 696 additions and 738 deletions.
diff --git a/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/visitor/validator/ValidateVisitor.java b/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/visitor/validator/ValidateVisitor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 1997, 2021 IBM Corporation and others.
+ * Copyright (c) 1997, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -1771,19 +1771,19 @@ else if (checkDeferred && ((ELNode.Root) node).getType() == '#') {
 	//method used to replace ELSupport.checkType
 	private final static void ELCheckType(final Object obj, final Class<?> type) throws ELException {
 	    if (String.class.equals(type)) {
-	        ELSupport.coerceToString(null, obj);
+	        ELSupport.coerceToString(obj);
         }
         if (ELArithmetic.isNumberType(type)) {
-            ELSupport.coerceToNumber(null, obj, type);
+            ELSupport.coerceToNumber(obj, type);
         }
         if (Character.class.equals(type) || Character.TYPE == type) {
-            ELSupport.coerceToCharacter(null, obj);
+            ELSupport.coerceToCharacter(obj);
         }
         if (Boolean.class.equals(type) || Boolean.TYPE == type) {
-            ELSupport.coerceToBoolean(null, obj);
+            ELSupport.coerceToBoolean(obj);
         }
         if (type.isEnum()) {
-            ELSupport.coerceToEnum(null, obj, type);
+            ELSupport.coerceToEnum(obj, type);
         }
 	}
 

diff --git a/dev/com.ibm.ws.org.apache.jasper.el.2.2/bnd.bnd b/dev/com.ibm.ws.org.apache.jasper.el.2.2/bnd.bnd
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2017, 2021 IBM Corporation and others.
+# Copyright (c) 2017 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -20,8 +20,6 @@ Export-Package: org.apache.el;thread-context=true, \
    org.apache.el.parser, \
    org.apache.el.util
 
-instrument.disabled: true
-
 -buildpath: \
 	com.ibm.ws.org.apache.el:jasper-el;version=2.2,\
 	com.ibm.websphere.javaee.el.2.2;version=latest