Merge "Fix double-checked locking bug in LocalSocket." into gingerbread

2010-09-21 10:30:39 -07:00
parent e520669417 c59a662382
commit 8217eac0a0
1 changed files with 5 additions and 2 deletions
--- a/core/java/android/net/LocalSocket.java
+++ b/core/java/android/net/LocalSocket.java
@@ -70,8 +70,11 @@ public class LocalSocket {
        if (!implCreated) {
            synchronized (this) {
                if (!implCreated) {
-                    implCreated = true;
-                    impl.create(true);
+                    try {
+                        impl.create(true);
+                    } finally {
+                        implCreated = true;
+                    }
                }
            }
        }