You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/05/29 04:52:41 UTC

incubator-kylin git commit: ci fix: synchronize on project update

Repository: incubator-kylin
Updated Branches:
  refs/heads/streaming-cubing e348b162f -> 2f9bc0230


ci fix: synchronize on project update


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/2f9bc023
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/2f9bc023
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/2f9bc023

Branch: refs/heads/streaming-cubing
Commit: 2f9bc02304b3e9d94611517bb7076d0dccfaca31
Parents: e348b16
Author: honma <ho...@ebay.com>
Authored: Fri May 29 10:52:31 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Fri May 29 10:52:31 2015 +0800

----------------------------------------------------------------------
 .../org/apache/kylin/metadata/project/ProjectManager.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2f9bc023/metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java b/metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java
index bcafcc7..dd146d9 100644
--- a/metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java
+++ b/metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java
@@ -19,7 +19,6 @@
 package org.apache.kylin.metadata.project;
 
 import com.google.common.collect.Lists;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.kylin.common.KylinConfig;
 import org.apache.kylin.common.persistence.JsonSerializer;
 import org.apache.kylin.common.persistence.ResourceStore;
@@ -225,9 +224,11 @@ public class ProjectManager {
     }
 
     private void updateProject(ProjectInstance prj) throws IOException {
-        getStore().putResource(prj.getResourcePath(), prj, PROJECT_SERIALIZER);
-        projectMap.put(norm(prj.getName()), prj); // triggers update broadcast
-        clearL2Cache();
+        synchronized (prj) {
+            getStore().putResource(prj.getResourcePath(), prj, PROJECT_SERIALIZER);
+            projectMap.put(norm(prj.getName()), prj); // triggers update broadcast
+            clearL2Cache();
+        }
     }
 
     private void removeProject(ProjectInstance proj) throws IOException {