Permalink
Browse files

fixed propagated merging issues

  • Loading branch information...
Matthieu Morel
Matthieu Morel committed Jul 15, 2011
2 parents 8d37460 + 200ee8f commit 0e311d092f42cfb95e4a7d2211442b30717c49a4
Showing with 5 additions and 6 deletions.
  1. +5 −6 s4-core/src/main/java/io/s4/processor/AbstractPE.java
@@ -104,7 +104,6 @@ public String getName() {
transient private long pauseTimeInMillis;
transient private boolean logPauses = false;
private String id;
- transient private String initMethod = null;
transient protected SchemaContainer schemaContainer = new SchemaContainer();
transient private boolean recoveryAttempted = false;
@@ -159,14 +158,14 @@ public void setId(String id) {
}
public void setClock(Clock clock) {
- synchronized (this) {
- this.clock = clock;
- this.notify();
+ if (this.clock != null) {
+ this.s4ClockSetSignal.countDown();
}
}
- /**
- * This method will be called after the object is cloned from the
+
+
+ /** This method will be called after the object is cloned from the
* prototype PE. The concrete PE class should override this if
* it has any special set-up requirements.
*/

0 comments on commit 0e311d0

Please sign in to comment.