Skip to content

Commit

Permalink
Merge pull request #107 from JCgH4164838Gh792C124B5/localOGNL_3_2_Cle…
Browse files Browse the repository at this point in the history
…anup1

Minor cleanup for 3.2.x, related to previous 3.1.x merges
  • Loading branch information
lukaszlenart committed Oct 13, 2020
2 parents 33d84dc + 614f850 commit 4ef9084
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/main/java/ognl/OgnlRuntime.java
Original file line number Diff line number Diff line change
Expand Up @@ -1211,9 +1211,6 @@ public static Object invokeMethod(Object target, Method method, Object[] argsArr
}
}
checkPermission = Boolean.FALSE.equals(methodPermCacheValue);
if (checkPermission) { // TODO: ***** This check/block to be removed if/when SecurityManager sandbox logic is merged from v3.1.x *****
throw new IllegalAccessException("Method [" + method + "] cannot be accessed.");
}
}

Object result;
Expand Down Expand Up @@ -2520,7 +2517,7 @@ public static boolean setFieldValue(OgnlContext context, Object target, String p

if (f != null) {
final int fModifiers = f.getModifiers();
if (!Modifier.isStatic(f.getModifiers()) && !Modifier.isFinal(fModifiers)) {
if (!Modifier.isStatic(fModifiers) && !Modifier.isFinal(fModifiers)) {
final Object state = context.getMemberAccess().setup(context, target, f, propertyName);
try {
if (isTypeCompatible(value, f.getType())
Expand Down

0 comments on commit 4ef9084

Please sign in to comment.