[jbosstools-commits] JBoss Tools SVN: r35771 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2011-10-18 15:53:17 -0400 (Tue, 18 Oct 2011)
New Revision: 35771

Modified:
   trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java
Log:
JBIDE-9917
https://issues.jboss.org/browse/JBIDE-9917
Method synchronization.

Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java	2011-10-18 18:02:11 UTC (rev 35770)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java	2011-10-18 19:53:17 UTC (rev 35771)
@@ -137,18 +137,16 @@
 		}
 	}
 
-	public void unlockJar() {
-		synchronized (this) {
-			jarLock--;
-			if(jarLock > 0 || jar == null) return;
-			if(jar != null && jarLock == 0) {
-				try {
-					jar.close();
-				} catch (IOException e) {
-            		//ignore
-				} finally {
-					jar = null;
-				}
+	public synchronized void unlockJar() {
+		jarLock--;
+		if(jarLock > 0 || jar == null) return;
+		if(jar != null && jarLock == 0) {
+			try {
+				jar.close();
+			} catch (IOException e) {
+           		//ignore
+			} finally {
+				jar = null;
 			}
 		}
 	}
@@ -183,7 +181,7 @@
 		set.add(parsed[1] + XModelObjectConstants.SEPARATOR);
 	}
 
-	public String[] getChildren(String path) {
+	public synchronized String[] getChildren(String path) {
 		HashSet<String> set = map.get(path);
 		return (set == null) ? new String[0] : set.toArray(new String[0]);
 	}
@@ -263,11 +261,11 @@
 		return FileUtil.isText(b);
 	}
 
-	boolean hasFolder(String path) {
-		return map.get(path) != null;
+	synchronized boolean hasFolder(String path) {
+		return map.containsKey(path);
 	}
 
-	boolean hasFile(String path) {
+	synchronized boolean hasFile(String path) {
 		if (path == null)
 			return false;
 		int i = path.lastIndexOf('/');
@@ -289,7 +287,7 @@
 		return (timeStamp != f.lastModified() || size != f.length());
 	}
 
-	public void invalidate() {
+	public synchronized void invalidate() {
 		exists = false;
 		map.clear();
 		timeStamp = -1;