| commit | a695e6cfe651d2d21c2cb22b17d8fb508d2f9694 | [log] [tgz] |
|---|---|---|
| author | salsubaiee <salsubaiee@gmail.com> | Tue Jun 04 14:08:06 2013 -0700 |
| committer | salsubaiee <salsubaiee@gmail.com> | Tue Jun 04 14:08:06 2013 -0700 |
| tree | 163bc84cfb1b7022a46bf213acdef0ca46616d51 | |
| parent | cc366ad267b6f4eb210c64c27eefbb1ada8c3834 [diff] | |
| parent | 0934f306de2a0d32aca351dd3baa4e36402f4217 [diff] |
Merge branch 'master' into raman/fullstack_lsm_staging_coredump
diff --git a/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/edu/uci/ics/hyracks/hdfs/dataflow/ConfFactory.java b/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/edu/uci/ics/hyracks/hdfs/dataflow/ConfFactory.java index 4fa0164..120ee77 100644 --- a/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/edu/uci/ics/hyracks/hdfs/dataflow/ConfFactory.java +++ b/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/edu/uci/ics/hyracks/hdfs/dataflow/ConfFactory.java
@@ -27,7 +27,7 @@ } } - public JobConf getConf() throws HyracksDataException { + public synchronized JobConf getConf() throws HyracksDataException { try { JobConf conf = new JobConf(); DataInputStream dis = new DataInputStream(new ByteArrayInputStream(confBytes));