From 44d403874a4fb7393badfd8a85cf9b37278fdf9f Mon Sep 17 00:00:00 2001
From: Yasser Zamani <yasserzamani@apache.org>
Date: Tue, 13 Aug 2019 15:42:32 +0430
Subject: [PATCH 1/3] not fail on getDeclaredXXX when user has used a
 SecurityManager

Falls back to getXXX on SecurityException to be more adaptable for environments that have a SecurityManager applied.
---
 src/java/ognl/OgnlRuntime.java | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/java/ognl/OgnlRuntime.java b/src/java/ognl/OgnlRuntime.java
index cb963db1..0fb10ac5 100644
--- a/src/java/ognl/OgnlRuntime.java
+++ b/src/java/ognl/OgnlRuntime.java
@@ -1861,7 +1861,12 @@ public static Map getMethods(Class targetClass, boolean staticMethods)
     }
 
     private static void collectMethods(Class c, Map result, boolean staticMethods) {
-        Method[] ma = c.getDeclaredMethods();
+        Method[] ma;
+        try {
+            ma = c.getDeclaredMethods();
+        } catch (SecurityException ignored) {
+            ma = c.getMethods();
+        }
         for (int i = 0, icount = ma.length; i < icount; i++)
         {
             if (c.isInterface())
@@ -1966,7 +1971,11 @@ public static Map getFields(Class targetClass)
                     Field fa[];
 
                     result = new HashMap(23);
-                    fa = targetClass.getDeclaredFields();
+                    try {
+                        fa = targetClass.getDeclaredFields();
+                    } catch (SecurityException ignored) {
+                        fa = targetClass.getFields();
+                    }
                     for (int i = 0; i < fa.length; i++) {
                         result.put(fa[i].getName(), fa[i]);
                     }
@@ -2264,7 +2273,12 @@ public static List getDeclaredMethods(Class targetClass, String propertyName, bo
 
     private static void collectAccessors(Class c, String baseName, List result, boolean findSets)
     {
-        final Method[] methods = c.getDeclaredMethods();
+        Method[] methods;
+        try{
+            methods = c.getDeclaredMethods();
+        } catch (SecurityException ignored) {
+            methods = c.getMethods();
+        }
         for (int i = 0; i < methods.length; i++) {
             if (c.isInterface()) {
                 if (isDefaultMethod(methods[i])) {

From 88a22090ed15049eb346242d5d1475ab0bc691f0 Mon Sep 17 00:00:00 2001
From: Yasser Zamani <yasserzamani@apache.org>
Date: Sat, 7 Sep 2019 15:00:16 +0430
Subject: [PATCH 2/3] fix Travis build

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 52579714..59173c55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,8 +81,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
                 <executions>
                     <execution>
@@ -92,8 +92,8 @@
                             <goal>testCompile</goal>
                         </goals>
                         <configuration>
-                            <source>1.5</source>
-                            <target>1.5</target>
+                            <source>1.6</source>
+                            <target>1.6</target>
                         </configuration>
                     </execution>
                 </executions>

From 8853a98e40d8de6192ced2ae049a5a68342251c7 Mon Sep 17 00:00:00 2001
From: Yasser Zamani Babgohari <yasserzamani@apache.org>
Date: Thu, 12 Sep 2019 17:30:45 +0430
Subject: [PATCH 3/3] format code

---
 src/java/ognl/OgnlRuntime.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java/ognl/OgnlRuntime.java b/src/java/ognl/OgnlRuntime.java
index 0fb10ac5..12dacaeb 100644
--- a/src/java/ognl/OgnlRuntime.java
+++ b/src/java/ognl/OgnlRuntime.java
@@ -2274,7 +2274,7 @@ public static List getDeclaredMethods(Class targetClass, String propertyName, bo
     private static void collectAccessors(Class c, String baseName, List result, boolean findSets)
     {
         Method[] methods;
-        try{
+        try {
             methods = c.getDeclaredMethods();
         } catch (SecurityException ignored) {
             methods = c.getMethods();