You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ac...@apache.org on 2013/06/21 03:33:31 UTC
git commit: updated refs/heads/trunk to d333c40
Updated Branches:
refs/heads/trunk 8f89bd85a -> d333c4099
GIRAPH-694 Setting configuration in GiraphConfiguration causes
non thread safe copies (aching)
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/d333c409
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/d333c409
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/d333c409
Branch: refs/heads/trunk
Commit: d333c4099abc0280335a56a73104deeb734e6057
Parents: 8f89bd8
Author: Avery Ching <ac...@fb.com>
Authored: Thu Jun 20 11:28:05 2013 -0700
Committer: Avery Ching <ac...@fb.com>
Committed: Thu Jun 20 18:32:51 2013 -0700
----------------------------------------------------------------------
CHANGELOG | 3 +++
.../apache/giraph/conf/GiraphConfiguration.java | 19 ++++++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/d333c409/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index dda130e..342faec 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
Giraph Change Log
Release 1.1.0 - unreleased
+ GIRAPH-694 Setting configuration in GiraphConfiguration causes
+ non thread safe copies (aching)
+
GIRAPH-683: Jython for Computation (nitay)
GIRAPH-673: Input superstep should support aggregators like any
http://git-wip-us.apache.org/repos/asf/giraph/blob/d333c409/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java
index 87c4c18..2d232a6 100644
--- a/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java
+++ b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java
@@ -988,7 +988,7 @@ public class GiraphConfiguration extends Configuration
*
* @param conf Configuration
*/
- public void updateConfiguration(Configuration conf) {
+ public synchronized void updateConfiguration(Configuration conf) {
if (this != conf) {
for (Map.Entry<String, String> parameter : giraphSetParameters) {
conf.set(parameter.getKey(), parameter.getValue());
@@ -997,49 +997,50 @@ public class GiraphConfiguration extends Configuration
}
@Override
- public void set(String name, String value) {
+ public synchronized void set(String name, String value) {
super.set(name, value);
giraphSetParameters.set(name, value);
}
@Override
- public void setIfUnset(String name, String value) {
+ public synchronized void setIfUnset(String name, String value) {
super.setIfUnset(name, value);
giraphSetParameters.set(name, get(name, value));
}
@Override
- public void setInt(String name, int value) {
+ public synchronized void setInt(String name, int value) {
super.setInt(name, value);
giraphSetParameters.setInt(name, value);
}
@Override
- public void setLong(String name, long value) {
+ public synchronized void setLong(String name, long value) {
super.setLong(name, value);
giraphSetParameters.setLong(name, value);
}
@Override
- public void setFloat(String name, float value) {
+ public synchronized void setFloat(String name, float value) {
super.setFloat(name, value);
giraphSetParameters.setFloat(name, value);
}
@Override
- public void setBoolean(String name, boolean value) {
+ public synchronized void setBoolean(String name, boolean value) {
super.setBoolean(name, value);
giraphSetParameters.setBoolean(name, value);
}
@Override
- public void setBooleanIfUnset(String name, boolean value) {
+ public synchronized void setBooleanIfUnset(String name, boolean value) {
super.setBooleanIfUnset(name, value);
giraphSetParameters.setBoolean(name, getBoolean(name, value));
}
@Override
- public void setClass(String name, Class<?> theClass, Class<?> xface) {
+ public synchronized void setClass(String name, Class<?> theClass,
+ Class<?> xface) {
super.setClass(name, theClass, xface);
giraphSetParameters.setClass(name, theClass, xface);
}