Merge remote-tracking branch 'origin/master'

This commit is contained in:
anna
2012-02-09 09:53:54 +01:00
@@ -891,7 +891,7 @@ public class MavenProject {
volatile List<MavenPlugin> myUnresolvedPluginsCache;
volatile List<MavenArtifact> myUnresolvedExtensionsCache;
ConcurrentHashMap<Key, Object> myCache = new ConcurrentHashMap<Key, Object>();
transient ConcurrentHashMap<Key, Object> myCache = new ConcurrentHashMap<Key, Object>();
@Override
public State clone() {
@@ -940,5 +940,10 @@ public class MavenProject {
return result;
}
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
myCache = new ConcurrentHashMap<Key, Object>();
}
}
}