Merge pull request #989 from AlexCai2019/master

Minor refactoring

Author: stleary

src/main/java/org/json/JSONObject.java

@@ -2753,13 +2753,13 @@ private static Object wrap(Object object, Set<Object> objectsRecord, int recursi
                 return NULL;
             }
             if (object instanceof JSONObject || object instanceof JSONArray
-                    || NULL.equals(object) || object instanceof JSONString
+                    || object instanceof JSONString || object instanceof String
                     || object instanceof Byte || object instanceof Character
                     || object instanceof Short || object instanceof Integer
                     || object instanceof Long || object instanceof Boolean
                     || object instanceof Float || object instanceof Double
-                    || object instanceof String || object instanceof BigInteger
-                    || object instanceof BigDecimal || object instanceof Enum) {
+                    || object instanceof BigInteger || object instanceof BigDecimal
+                    || object instanceof Enum) {
                 return object;
             }
 

src/main/java/org/json/JSONPointer.java

@@ -246,7 +246,7 @@ private static Object readByIndexToken(Object current, String indexToken) throws
      */
     @Override
     public String toString() {
-        StringBuilder rval = new StringBuilder("");
+        StringBuilder rval = new StringBuilder();
         for (String token: this.refTokens) {
             rval.append('/').append(escape(token));
         }