diff options
6 files changed, 13 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java index d3a9c161a9..f9ab82e26a 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java @@ -32,7 +32,7 @@ public class CDOServerProtocol extends CDOProtocolImpl } @Override - protected SignalReactor doCreateSignalReactor(short signalID) + protected SignalReactor createSignalReactor(short signalID) { switch (signalID) { diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocol.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocol.java index 04888afba3..3f695769bb 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocol.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocol.java @@ -31,7 +31,7 @@ public class ServerProtocol extends SignalProtocol } @Override - protected SignalReactor doCreateSignalReactor(short signalID) + protected SignalReactor createSignalReactor(short signalID) { switch (signalID) { diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocol.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocol.java index d40205f6d6..d69820092f 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocol.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocol.java @@ -38,7 +38,7 @@ public class ClientProtocol extends SignalProtocol } @Override - protected SignalReactor doCreateSignalReactor(short signalID) + protected SignalReactor createSignalReactor(short signalID) { switch (signalID) { diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java index fb1707c0db..d6d719b5bb 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java @@ -29,7 +29,7 @@ public class JMSServerProtocol extends SignalProtocol } @Override - protected SignalReactor doCreateSignalReactor(short signalID) + protected SignalReactor createSignalReactor(short signalID) { switch (signalID) { diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java index 82ea5bd03f..099df2345a 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java @@ -40,7 +40,7 @@ public class TestSignalProtocol extends SignalProtocol } @Override - protected SignalReactor doCreateSignalReactor(short signalID) + protected SignalReactor createSignalReactor(short signalID) { switch (signalID) { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java index 0367b0a6fd..c55e1c2a52 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java @@ -156,7 +156,7 @@ public abstract class SignalProtocol extends Protocol TRACER.trace("Got signal id " + signalID); //$NON-NLS-1$ } - signal = createSignalReactor(signalID); + signal = provideSignalReactor(signalID); signal.setProtocol(this); signal.setCorrelationID(-correlationID); signal.setBufferInputStream(new SignalInputStream(getInputStreamTimeout())); @@ -199,10 +199,10 @@ public abstract class SignalProtocol extends Protocol return MessageFormat.format("SignalProtocol[{0}]", getType()); //$NON-NLS-1$ } - protected final SignalReactor createSignalReactor(short signalID) + protected final SignalReactor provideSignalReactor(short signalID) { checkActive(); - SignalReactor signal = doCreateSignalReactor(signalID); + SignalReactor signal = createSignalReactor(signalID); if (signal == null) { throw new IllegalArgumentException("Invalid signalID " + signalID); @@ -211,7 +211,11 @@ public abstract class SignalProtocol extends Protocol return signal; } - protected abstract SignalReactor doCreateSignalReactor(short signalID); + /** + * Returns a new signal instance to serve the given signalID or <code>null</code> if the signalID is invalid for this + * protocol. + */ + protected abstract SignalReactor createSignalReactor(short signalID); void startSignal(SignalActor<?> signalActor, long timeout) throws Exception { |