commit ae3360773d0c6c56c256e9ecd7f2a9f3d845c4e1
author Elliott Hughes <enh@google.com> Tue Dec 04 12:26:45 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 04 12:26:46 2012 -0800
tree 14f210e1b520c9850b0e380c39d8c0e0aaa46311
parent ebbcf53903c05cc4472329019d44a80d2c8380cf
parent 2c7adc8670dfc1c395d7d99bd95b9d14b129d0f9

Merge "Synchronize calls to Matcher.closeImpl."

luni/src/main/java/java/util/regex/Matcher.java

diff --git a/luni/src/main/java/java/util/regex/Matcher.java b/luni/src/main/java/java/util/regex/Matcher.java
index cfd4432..ce2dfe7 100644
--- a/luni/src/main/java/java/util/regex/Matcher.java
+++ b/luni/src/main/java/java/util/regex/Matcher.java
@@ -229,11 +229,13 @@
 
         this.pattern = pattern;
 
-        if (address != 0) {
-            closeImpl(address);
-            address = 0;
+        synchronized (this) {
+            if (address != 0) {
+                closeImpl(address);
+                address = 0; // In case openImpl throws.
+            }
+            address = openImpl(pattern.address);
         }
-        address = openImpl(pattern.address);
 
         if (input != null) {
             resetForInput();
@@ -634,7 +636,9 @@
 
     @Override protected void finalize() throws Throwable {
         try {
-            closeImpl(address);
+            synchronized (this) {
+                closeImpl(address);
+            }
         } finally {
             super.finalize();
         }