Merge branch 'master' into candidate-6.0.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

cmake_modules/FindJNI.cmake

@@ -195,6 +195,7 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_EXPANDED_INCLUDE_DIRECTORIES
   /usr/lib/jvm/java-6-sun-1.6.0.00/include       # can this one be removed according to #8821 ? Alex
   /usr/lib/jvm/java-7-openjdk-{libarch}/include  # Ubuntu 13.04 location
   /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch}  # Ubuntu 12.10 location
+  /usr/lib/jvm/java-6-openjdk-{libarch}/include
   /usr/lib/jvm/java-6-openjdk/include
   /usr/local/share/java/include
   /usr/lib/j2sdk1.4-sun/include

common/thorhelper/thorsoapcall.cpp

@@ -1754,7 +1754,7 @@ public:
     {
         StringBuffer request;
         StringBuffer response;
-        unsigned attempts = 0;
+        unsigned numRetries = 0;
         unsigned retryInterval = 0;
 
         Url &url = master->urlArray.item(idx);
@@ -1917,17 +1917,17 @@ public:
 
                 // other IException ... retry up to maxRetries
                 StringBuffer s;
-                master->logctx.CTXLOG("Exception %s - retrying? (%d<%d)", e->errorMessage(s).str(), attempts, master->maxRetries);
+                master->logctx.CTXLOG("Exception %s", e->errorMessage(s).str());
 
-                if (attempts > master->maxRetries)
+                if (numRetries >= master->maxRetries)
                 {
                     // error affects all inputRows
-                    master->logctx.CTXLOG("Exiting: maxRetries exceeded");
+                    master->logctx.CTXLOG("Exiting: maxRetries %d exceeded", master->maxRetries);
                     processException(url, inputRows, e);
                     break;
                 }
-                master->logctx.CTXLOG("Retrying: maxRetries not exceeded");
-                attempts++;
+                numRetries++;
+                master->logctx.CTXLOG("Retrying: attempt %d of %d", numRetries, master->maxRetries);
                 e->Release();
             }
             catch (std::exception & es)