Merge pull request #549 from Azure/legacy-dev

Legacy dev
Azure · Jun 24, 2020 · 7a1f232 · 7a1f232
2 parents cdd966e + 921b5cc
commit 7a1f232
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 7 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,6 @@
+2020.06.22 Version 8.6.5
+ * Fixed a race condition in XML parsing logic that in narrow situations could cause the parser to be initialized incorrectly resulting in an erroneously empty list result.
+
 2020.05.04 Version 8.6.4
  * Converted the httpsKeepAliveSocketFactory into a singleton for performance improvements.
 

diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ To get the binaries of this library as distributed by Microsoft, ready for use w
 <dependency>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>azure-storage</artifactId>
-	<version>8.6.4</version>
+	<version>8.6.5</version>
 </dependency>
 ```
 

diff --git a/microsoft-azure-storage-samples/pom.xml b/microsoft-azure-storage-samples/pom.xml
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-storage</artifactId>
-			<version>8.6.4</version>
+			<version>8.6.5</version>
 		</dependency>
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>

diff --git a/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/logging/pom.xml b/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/logging/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-storage</artifactId>
-            <version>8.6.4</version>
+            <version>8.6.5</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>

diff --git a/...soft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlobContainerTests.java b/...soft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlobContainerTests.java
@@ -22,8 +22,14 @@
 import java.net.URISyntaxException;
 import java.security.InvalidKeyException;
 import java.util.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.xml.parsers.SAXParser;
 
 import com.microsoft.azure.storage.*;
+import com.microsoft.azure.storage.core.Utility;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -541,6 +547,49 @@ public void testCloudBlobContainerListBlobs() throws StorageException, IOExcepti
         assertTrue(blobNames.size() == 0);
     }
 
+    @Test
+    @Category({DevFabricTests.class, DevStoreTests.class})
+    public void testSAXParserConcurrency() throws Exception {
+        final int totalCount = 200000;
+        final int numThreads = 200;
+        final AtomicInteger currentCount = new AtomicInteger(0);
+        final AtomicInteger pending = new AtomicInteger(0);
+        final AtomicInteger failureCount = new AtomicInteger(0);
+        ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(numThreads);
+
+        do {
+            final int count = currentCount.incrementAndGet();
+            pending.incrementAndGet();
+            executor.execute(new Runnable() {
+                @Override
+                public void run() {
+                    pending.decrementAndGet();
+                    if (count > totalCount) {
+                        return;
+                    }
+                    try {
+                        SAXParser parser = Utility.getSAXParser();
+                        if (!parser.isNamespaceAware()) {
+                            failureCount.incrementAndGet();
+                        }
+                        assertEquals(true, parser.isNamespaceAware());
+                    } catch (Exception e) {
+                        fail(e.toString());
+                    }
+                }
+            });
+
+            assertEquals(0, failureCount.get());
+
+            while (pending.get() > numThreads * 2) {
+                Thread.sleep(10);
+            }
+        } while (currentCount.get() < totalCount);
+        executor.shutdown();
+        executor.awaitTermination(1, TimeUnit.MINUTES);
+        executor.shutdownNow();
+    }
+
     /**
      * List the blobs in a container with a prefix
      *

diff --git a/microsoft-azure-storage/src/com/microsoft/azure/storage/Constants.java b/microsoft-azure-storage/src/com/microsoft/azure/storage/Constants.java
@@ -765,7 +765,7 @@ public static class HeaderConstants {
         /**
          * Specifies the value to use for UserAgent header.
          */
-        public static final String USER_AGENT_VERSION = "8.6.4";
+        public static final String USER_AGENT_VERSION = "8.6.5";
 
         /**
          * The default type for content-type and accept

diff --git a/microsoft-azure-storage/src/com/microsoft/azure/storage/core/Utility.java b/microsoft-azure-storage/src/com/microsoft/azure/storage/core/Utility.java
@@ -129,9 +129,8 @@ protected DateFormat initialValue() {
      * Thread local for SAXParser.
      */
     private static final ThreadLocal<SAXParser> saxParserThreadLocal = new ThreadLocal<SAXParser>() {
-        SAXParserFactory factory;
         @Override public SAXParser initialValue() {
-            factory = SAXParserFactory.newInstance();
+            SAXParserFactory factory = SAXParserFactory.newInstance();
             factory.setNamespaceAware(true);
             try {
                 return factory.newSAXParser();

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>azure-storage</artifactId>
-	<version>8.6.4</version>
+	<version>8.6.5</version>
 	<packaging>jar</packaging>
 
 	<name>Microsoft Azure Storage Client SDK</name>