bugfix: null while analyzing checking for binary content

21877950 · Adi Amir · bb55ceda · 21877950 · 21877950 · 21877950
Commit 21877950 authored May 23, 2019 by Adi Amir
Showing with 61 additions and 41 deletions
build.gradle
gradlew
gradlew.bat
--- a/build.gradle
+++ b/build.gradle
 group 'com.ipgallery.common'
-version '1.2.5'
+version '1.2.6'
 apply plugin: 'java'
 apply plugin: 'maven-publish'
@@ -14,11 +14,24 @@ repositories {
    //use mavenLocal in cases you want to create this jar on your local machine
    //or to be able to use one
    //mavenLocal()
-    maven { url "http://172.16.1.132:8081/repository/internal" }
    maven { url "http://mandubian-mvn.googlecode.com/svn/trunk/mandubian-mvn/repository" }
+    maven { url "http://mandubian-mvn.googlecode.com/svn/trunk/mandubian-mvn/repository" }
+    maven { url "https://municipalitybank.com:8081/repository/internal" }
 }
 dependencies {
+//    compile 'log4j:log4j:1.2.17'
+//    compile 'commons-io:commons-io:2.0.1'
+//    compile 'redis.clients:jedis:2.4.2'
+//    compile 'com.fasterxml.jackson.core:jackson-databind:2.2.3'
+//    compile 'com.googlecode.libphonenumber:libphonenumber:5.8'
+//    compile group: 'com.google.gdata', name: 'core', version: '1.47.1'
+//    compile 'org.apache.httpcomponents:httpclient:4.5.2'
+//    compile 'org.apache.httpcomponents:httpmime:4.1'
+//    compile 'javax.ws.rs:javax.ws.rs-api:2.0'
+//    compile 'com.ipgallery.common:itc:1.0.0'
    compile 'log4j:log4j:1.2.17'
    compile 'commons-io:commons-io:2.0.1'
    compile 'redis.clients:jedis:2.4.2'
@@ -30,6 +43,7 @@ dependencies {
    compile 'javax.ws.rs:javax.ws.rs-api:2.0'
    compile 'com.ipgallery.common:itc:1.0.0'
    testCompile group: 'junit', name: 'junit', version: '4.11'
 }
@@ -49,7 +63,7 @@ publishing {
    publications {
        repositories.maven {
-            url 'http://172.16.1.132:8081/repository/internal'
+            url 'https://municipalitybank.com:8081/repository/internal'
            credentials {
                username "admin"
                password "giptmgr1"

--- a/gradlew
+++ b/gradlew
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 ##############################################################################
 ##
@@ -6,12 +6,30 @@
 ##
 ##############################################################################
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+# Attempt to set APP_HOME
-DEFAULT_JVM_OPTS=""
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
  CYGWIN* )
    cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
  MINGW* )
    msys=true
    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
    MAX_FD_LIMIT=`ulimit -H -n`
    if [ $? -eq 0 ] ; then
        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
    esac
 fi
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+# Escape application args
-function splitJvmOpts() {
+save ( ) {
-    JVM_OPTS=("$@")
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+APP_ARGS=$(save "$@")
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 set CMD_LINE_ARGS=%*
-goto execute
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 :execute
 @rem Setup the command line