diff options
82 files changed, 220 insertions, 222 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerIndication.java index 6a7ccaf4be..1b606c1a45 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerIndication.java @@ -109,7 +109,7 @@ public abstract class CDOServerIndication extends IndicationWithResponse } @Override - protected final void indicating(ExtendedDataInputStream in) throws IOException + protected final void indicating(ExtendedDataInputStream in) throws Exception { indicating(new CDODataInputImpl(in) { @@ -146,7 +146,7 @@ public abstract class CDOServerIndication extends IndicationWithResponse } @Override - protected final void responding(ExtendedDataOutputStream out) throws IOException + protected final void responding(ExtendedDataOutputStream out) throws Exception { responding(new CDODataOutputImpl(out) { diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerRequest.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerRequest.java index 86330d95e3..56310b8373 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerRequest.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerRequest.java @@ -103,7 +103,7 @@ public abstract class CDOServerRequest extends Request } @Override - protected final void requesting(ExtendedDataOutputStream out) throws IOException + protected final void requesting(ExtendedDataOutputStream out) throws Exception { requesting(new CDODataOutputImpl(out) { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientIndication.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientIndication.java index 6eeaeeb84b..4ef5b6fd10 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientIndication.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientIndication.java @@ -71,7 +71,7 @@ public abstract class CDOClientIndication extends Indication } @Override - protected final void indicating(ExtendedDataInputStream in) throws IOException + protected final void indicating(ExtendedDataInputStream in) throws Exception { indicating(new CDODataInputImpl(in) { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java index 027e475613..e5e7035421 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java @@ -80,7 +80,7 @@ public abstract class CDOClientRequest<RESULT> extends RequestWithConfirmation<R } @Override - protected final void requesting(ExtendedDataOutputStream out) throws IOException + protected final void requesting(ExtendedDataOutputStream out) throws Exception { requesting(new CDODataOutputImpl(out) { @@ -98,7 +98,7 @@ public abstract class CDOClientRequest<RESULT> extends RequestWithConfirmation<R } @Override - protected final RESULT confirming(ExtendedDataInputStream in) throws IOException + protected final RESULT confirming(ExtendedDataInputStream in) throws Exception { return confirming(new CDODataInputImpl(in) { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadLibrariesRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadLibrariesRequest.java index 18a857fe82..a00d465e6f 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadLibrariesRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadLibrariesRequest.java @@ -22,7 +22,6 @@ import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.File; import java.io.FileOutputStream; -import java.io.IOException; import java.util.Collection; /** @@ -44,7 +43,7 @@ public class LoadLibrariesRequest extends RequestWithConfirmation<Integer> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { int size = libraryNames.size(); if (PROTOCOL_TRACER.isEnabled()) @@ -65,7 +64,7 @@ public class LoadLibrariesRequest extends RequestWithConfirmation<Integer> } @Override - protected Integer confirming(ExtendedDataInputStream in) throws IOException + protected Integer confirming(ExtendedDataInputStream in) throws Exception { byte[] buffer = new byte[IOUtil.DEFAULT_BUFFER_SIZE]; int count = 0; diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateIndication.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateIndication.java index 440f45a38b..059715ddaa 100644 --- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateIndication.java +++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateIndication.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.Indication; import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataInputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -28,7 +27,7 @@ public abstract class BuddyStateIndication extends Indication } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { String userID = in.readString(); State state = ProtocolUtil.readState(in); diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateNotification.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateNotification.java index 97c454e9cb..b35096fd6c 100644 --- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateNotification.java +++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateNotification.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -34,7 +33,7 @@ public class BuddyStateNotification extends Request } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeString(userID); ProtocolUtil.writeState(out, state); diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java index 406fb4b5e2..9ee37805cb 100644 --- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java +++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java @@ -18,7 +18,6 @@ import org.eclipse.net4j.signal.Indication; import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataInputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -38,7 +37,7 @@ public class CollaborationLeftIndication extends Indication } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { long collaborationID = in.readLong(); String userID = in.readString(); diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftNotification.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftNotification.java index 7fd1835278..5fa4471000 100644 --- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftNotification.java +++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftNotification.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -33,7 +32,7 @@ public class CollaborationLeftNotification extends Request } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeLong(collaborationID); out.writeString(userID); diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageIndication.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageIndication.java index f1d812b1f7..89c5d8a5ab 100644 --- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageIndication.java +++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageIndication.java @@ -18,7 +18,6 @@ import org.eclipse.net4j.signal.Indication; import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataInputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -34,7 +33,7 @@ public class MessageIndication extends Indication } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { long collaborationID = in.readLong(); String facilityType = in.readString(); diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageNotification.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageNotification.java index 726c70f4a3..f4e8e13411 100644 --- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageNotification.java +++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageNotification.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -37,7 +36,7 @@ public class MessageNotification extends Request } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeLong(collaborationID); out.writeString(facilityType); diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java index b98d316b24..f792389afe 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -34,7 +33,7 @@ public class BuddyAddedNotification extends Request } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeString(buddy); } diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java index 6e82efacce..befbea90cc 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -34,7 +33,7 @@ public class BuddyRemovedNotification extends Request } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeString(buddy); } diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java index 9f9c8a7ee3..1e690e8348 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java @@ -16,7 +16,6 @@ import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolUtil; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; import java.util.Collection; /** @@ -43,7 +42,7 @@ public class CollaborationInitiatedNotification extends Request } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeLong(collaborationID); ProtocolUtil.writeBuddies(out, buddies); diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java index ef484aaf89..6de49f2858 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolConstants; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -36,7 +35,7 @@ public class FacilityInstalledNotification extends Request } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeLong(collaborationID); out.writeString(facilityType); diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java index b445c36808..3a284838be 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java @@ -20,7 +20,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -38,7 +37,7 @@ public class InitiateCollaborationIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { String[] userIDs = ProtocolUtil.readUserIDs(in); ISession session = (ISession)getProtocol().getInfraStructure(); @@ -47,7 +46,7 @@ public class InitiateCollaborationIndication extends IndicationWithResponse } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { out.writeLong(collaboration.getID()); } diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java index da479ae9a7..a3b09836f7 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java @@ -23,7 +23,6 @@ import org.eclipse.net4j.util.container.IPluginContainer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -43,7 +42,7 @@ public class InstallFacilityIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { long collaborationID = in.readLong(); String facilityType = in.readString(); @@ -88,7 +87,7 @@ public class InstallFacilityIndication extends IndicationWithResponse } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { out.writeBoolean(success); } diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java index 74dbbea887..b3cef41f52 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java @@ -20,7 +20,6 @@ import org.eclipse.net4j.signal.Indication; import org.eclipse.net4j.util.WrappedException; import org.eclipse.net4j.util.io.ExtendedDataInputStream; -import java.io.IOException; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -40,7 +39,7 @@ public class InviteBuddiesIndication extends Indication } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { long collaborationID = in.readLong(); String[] userIDs = ProtocolUtil.readUserIDs(in); diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java index fd5bf26be5..15d9e48038 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java @@ -18,7 +18,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -36,14 +35,14 @@ public class LoadAccountIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { String userID = in.readString(); account = IBuddyAdmin.INSTANCE.getAccounts().get(userID); } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { ProtocolUtil.writeAccount(out, account); } diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java index f3ddcff680..22a8ff383b 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java @@ -21,7 +21,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -43,7 +42,7 @@ public class OpenSessionIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { String userID = in.readString(); String password = in.readString(); @@ -70,7 +69,7 @@ public class OpenSessionIndication extends IndicationWithResponse } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { ProtocolUtil.writeAccount(out, account); if (account != null) diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java index 2af02f5310..625a70b4c9 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java @@ -16,7 +16,6 @@ import org.eclipse.net4j.signal.Indication; import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataInputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -29,7 +28,7 @@ public class BuddyAddedIndication extends Indication } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { String buddy = in.readString(); ClientSession session = ((BuddiesClientProtocol)getProtocol()).getSession(); diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java index 45d8e5cee9..546d79cffd 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java @@ -16,7 +16,6 @@ import org.eclipse.net4j.signal.Indication; import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataInputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -29,7 +28,7 @@ public class BuddyRemovedIndication extends Indication } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { String buddy = in.readString(); ClientSession session = ((BuddiesClientProtocol)getProtocol()).getSession(); diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java index 026e595c71..532dfec669 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java @@ -20,7 +20,6 @@ import org.eclipse.net4j.internal.buddies.Self; import org.eclipse.net4j.signal.Indication; import org.eclipse.net4j.util.io.ExtendedDataInputStream; -import java.io.IOException; import java.util.Set; /** @@ -34,7 +33,7 @@ public class CollaborationInitiatedIndication extends Indication } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { IBuddySession session = (IBuddySession)getProtocol().getInfraStructure(); Self self = (Self)session.getSelf(); diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java index 080739a1c8..0ca03820a8 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java @@ -18,7 +18,6 @@ import org.eclipse.net4j.internal.buddies.Self; import org.eclipse.net4j.signal.Indication; import org.eclipse.net4j.util.io.ExtendedDataInputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -31,7 +30,7 @@ public class FacilityInstalledIndication extends Indication } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { long collaborationID = in.readLong(); String facilityType = in.readString(); diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java index f9090e19fd..9467b9bdd7 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java @@ -17,7 +17,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; import java.util.Collection; /** @@ -34,13 +33,13 @@ public class InitiateCollaborationRequest extends RequestWithConfirmation<Long> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { ProtocolUtil.writeBuddies(out, buddies); } @Override - protected Long confirming(ExtendedDataInputStream in) throws IOException + protected Long confirming(ExtendedDataInputStream in) throws Exception { return in.readLong(); } diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java index 6199c86415..8503cd680e 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -34,14 +33,14 @@ public class InstallFacilityRequest extends RequestWithConfirmation<Boolean> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeLong(collaborationID); out.writeString(facilityType); } @Override - protected Boolean confirming(ExtendedDataInputStream in) throws IOException + protected Boolean confirming(ExtendedDataInputStream in) throws Exception { return in.readBoolean(); } diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java index 82feef70d1..74cd1c8887 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java @@ -16,7 +16,6 @@ import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolUtil; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; import java.util.Collection; /** @@ -36,7 +35,7 @@ public class InviteBuddiesNotification extends Request } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeLong(collaborationID); ProtocolUtil.writeBuddies(out, buddies); diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java index e1cd712849..a4c3d52983 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java @@ -17,7 +17,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -33,13 +32,13 @@ public class LoadAccountRequest extends RequestWithConfirmation<IAccount> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeString(userID); } @Override - protected IAccount confirming(ExtendedDataInputStream in) throws IOException + protected IAccount confirming(ExtendedDataInputStream in) throws Exception { return ProtocolUtil.readAccount(in); } diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java index 822ea6b32a..134cee851e 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java @@ -19,7 +19,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; import java.util.Set; /** @@ -42,7 +41,7 @@ public class OpenSessionRequest extends RequestWithConfirmation<IBuddySession> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeString(userID); out.writeString(password); @@ -54,7 +53,7 @@ public class OpenSessionRequest extends RequestWithConfirmation<IBuddySession> } @Override - protected IBuddySession confirming(ExtendedDataInputStream in) throws IOException + protected IBuddySession confirming(ExtendedDataInputStream in) throws Exception { IAccount account = ProtocolUtil.readAccount(in); if (account == null) diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java index ab672ab09b..d72368426b 100644 --- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java +++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -32,13 +31,13 @@ public class EchoRequest extends RequestWithConfirmation<String> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeString(message); } @Override - protected String confirming(ExtendedDataInputStream in) throws IOException + protected String confirming(ExtendedDataInputStream in) throws Exception { return in.readString(); } diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java index 9dba93759a..29ba22315f 100644 --- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java +++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -31,13 +30,13 @@ public class EchoIndication extends IndicationWithResponse implements EchoProtoc } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { message = in.readString(); } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { out.writeString(message); } diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java index 394f756107..e704cdb4c6 100644 --- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java +++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -34,14 +33,14 @@ public class JMSCreateDestinationRequest extends RequestWithConfirmation<Boolean } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeByte(type); out.writeString(name); } @Override - protected Boolean confirming(ExtendedDataInputStream in) throws IOException + protected Boolean confirming(ExtendedDataInputStream in) throws Exception { return in.readBoolean(); } diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java index d7dc87193c..f1011d9651 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java @@ -17,7 +17,6 @@ import org.eclipse.net4j.jms.internal.server.bundle.OM; import org.eclipse.net4j.signal.Indication; import org.eclipse.net4j.util.io.ExtendedDataInputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -30,7 +29,7 @@ public class JMSAcknowledgeIndication extends Indication } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { int sessionID = in.readInt(); diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java index ecd3d39ec2..4d6d8978e7 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java @@ -19,7 +19,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -34,7 +33,7 @@ public class JMSClientMessageIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { MessageImpl[] messages = { MessageUtil.read(in) }; JMSServerProtocol protocol = (JMSServerProtocol)getProtocol(); @@ -48,7 +47,7 @@ public class JMSClientMessageIndication extends IndicationWithResponse } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { out.writeString(messageID); } diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java index c1cc1600d4..2ee2109c91 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java @@ -20,7 +20,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -35,7 +34,7 @@ public class JMSCommitIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { int sessionID = in.readInt(); int size = in.readInt(); @@ -58,7 +57,7 @@ public class JMSCommitIndication extends IndicationWithResponse } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { if (messageIDs == null) { diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java index 28d4ea64ca..b0eb83f187 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java @@ -18,7 +18,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -33,7 +32,7 @@ public class JMSLogonIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { String userName = in.readString(); String password = in.readString(); @@ -51,7 +50,7 @@ public class JMSLogonIndication extends IndicationWithResponse } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { out.writeBoolean(ok); } diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java index 11f0306aa5..c1a99f0c8f 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java @@ -17,7 +17,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -32,7 +31,7 @@ public class JMSOpenSessionIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { int sessionID = in.readInt(); JMSServerProtocol protocol = (JMSServerProtocol)getProtocol(); @@ -45,7 +44,7 @@ public class JMSOpenSessionIndication extends IndicationWithResponse } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { out.writeBoolean(ok); } diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java index 9ce454e50a..1074a114f7 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java @@ -18,7 +18,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -31,7 +30,7 @@ public class JMSRecoverIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { int sessionID = in.readInt(); JMSServerProtocol protocol = (JMSServerProtocol)getProtocol(); @@ -47,7 +46,7 @@ public class JMSRecoverIndication extends IndicationWithResponse } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { } } diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java index 9cafe5259a..6dec319c5c 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java @@ -19,7 +19,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -34,7 +33,7 @@ public class JMSRegisterConsumerIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { int sessionID = in.readInt(); DestinationImpl destination = DestinationUtil.read(in); @@ -48,7 +47,7 @@ public class JMSRegisterConsumerIndication extends IndicationWithResponse } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { out.writeLong(consumerID); } diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java index 6ba0c220e2..b9a82217f4 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java @@ -18,7 +18,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -31,7 +30,7 @@ public class JMSRollbackIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { int sessionID = in.readInt(); JMSServerProtocol protocol = (JMSServerProtocol)getProtocol(); @@ -47,7 +46,7 @@ public class JMSRollbackIndication extends IndicationWithResponse } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { out.writeBoolean(true); } diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java index aae3168f88..4e7bba4bef 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java @@ -16,7 +16,6 @@ import org.eclipse.net4j.jms.JMSProtocolConstants; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -38,7 +37,7 @@ public class JMSServerMessageRequest extends Request } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeInt(sessionID); out.writeLong(consumerID); diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java index 1a5d3b942f..91283ccc59 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -28,12 +27,12 @@ public class JMSSyncIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { out.writeLong(System.currentTimeMillis()); } diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java index 9044e998af..8631eb8397 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java @@ -18,7 +18,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -33,7 +32,7 @@ public class JMSCreateDestinationIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { byte type = in.readByte(); String name = in.readString(); @@ -47,7 +46,7 @@ public class JMSCreateDestinationIndication extends IndicationWithResponse } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { out.writeBoolean(ok); } diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java index a0bb721ea9..cbb306c22f 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.jms.JMSProtocolConstants; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -33,7 +32,7 @@ public class JMSAcknowledgeRequest extends Request } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeInt(sessionID); } diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java index 2696ceb83b..bb432e88fc 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java @@ -17,7 +17,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -36,13 +35,13 @@ public class JMSClientMessageRequest extends RequestWithConfirmation<String> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { MessageUtil.write(out, message); } @Override - protected String confirming(ExtendedDataInputStream in) throws IOException + protected String confirming(ExtendedDataInputStream in) throws Exception { return in.readString(); } diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java index 4d3001245e..914a7020d5 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -34,13 +33,13 @@ public class JMSCloseSessionRequest extends RequestWithConfirmation<Boolean> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeInt(sessionID); } @Override - protected Boolean confirming(ExtendedDataInputStream in) throws IOException + protected Boolean confirming(ExtendedDataInputStream in) throws Exception { return in.readBoolean(); } diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java index d0c41b8a47..3ccc0ff203 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java @@ -17,7 +17,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; import java.util.List; /** @@ -40,7 +39,7 @@ public class JMSCommitRequest extends RequestWithConfirmation<String[]> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeInt(sessionID); out.writeInt(messages.size()); @@ -51,7 +50,7 @@ public class JMSCommitRequest extends RequestWithConfirmation<String[]> } @Override - protected String[] confirming(ExtendedDataInputStream in) throws IOException + protected String[] confirming(ExtendedDataInputStream in) throws Exception { int size = in.readInt(); if (size == -1) diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java index 0684b62ff4..d7f6ca5a59 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -37,14 +36,14 @@ public class JMSDeregisterConsumerRequest extends RequestWithConfirmation<Boolea } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeInt(sessionID); out.writeLong(consumerID); } @Override - protected Boolean confirming(ExtendedDataInputStream in) throws IOException + protected Boolean confirming(ExtendedDataInputStream in) throws Exception { return in.readBoolean(); } diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java index bd4079f7f9..9e1b2ff4fa 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.jms.JMSProtocolConstants; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -30,7 +29,7 @@ public class JMSLogoffRequest extends Request } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { } } diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java index 25e34ee40e..7c101ccaea 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -37,14 +36,14 @@ public class JMSLogonRequest extends RequestWithConfirmation<Boolean> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeString(userName); out.writeString(password); } @Override - protected Boolean confirming(ExtendedDataInputStream in) throws IOException + protected Boolean confirming(ExtendedDataInputStream in) throws Exception { return in.readBoolean(); } diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java index 31dfb30433..4dcb0f59f3 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -34,13 +33,13 @@ public class JMSOpenSessionRequest extends RequestWithConfirmation<Boolean> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeInt(sessionID); } @Override - protected Boolean confirming(ExtendedDataInputStream in) throws IOException + protected Boolean confirming(ExtendedDataInputStream in) throws Exception { return in.readBoolean(); } diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java index 5d02aae7fe..3b020e4d66 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -34,13 +33,13 @@ public class JMSRecoverRequest extends RequestWithConfirmation<Object> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeInt(sessionID); } @Override - protected Object confirming(ExtendedDataInputStream in) throws IOException + protected Object confirming(ExtendedDataInputStream in) throws Exception { return null; } diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java index 7e37a6a58e..29a614bc0f 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java @@ -17,7 +17,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -49,7 +48,7 @@ public class JMSRegisterConsumerRequest extends RequestWithConfirmation<Long> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeInt(sessionID); DestinationUtil.write(out, destination); @@ -59,7 +58,7 @@ public class JMSRegisterConsumerRequest extends RequestWithConfirmation<Long> } @Override - protected Long confirming(ExtendedDataInputStream in) throws IOException + protected Long confirming(ExtendedDataInputStream in) throws Exception { return in.readLong(); } diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java index a66cb66de8..e22fd63751 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -34,13 +33,13 @@ public class JMSRollbackRequest extends RequestWithConfirmation<Boolean> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeInt(sessionID); } @Override - protected Boolean confirming(ExtendedDataInputStream in) throws IOException + protected Boolean confirming(ExtendedDataInputStream in) throws Exception { return in.readBoolean(); } diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java index a7120cd938..9f6d2f83e5 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java @@ -17,7 +17,6 @@ import org.eclipse.net4j.jms.JMSProtocolConstants; import org.eclipse.net4j.signal.Indication; import org.eclipse.net4j.util.io.ExtendedDataInputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -33,7 +32,7 @@ public class JMSServerMessageIndication extends Indication } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { int sessionID = in.readInt(); long consumerID = in.readLong(); diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java index b7abea36fe..fed2491c89 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -33,13 +32,13 @@ public class JMSSyncRequest extends RequestWithConfirmation<Long> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { clientTime0 = System.currentTimeMillis(); } @Override - protected Long confirming(ExtendedDataInputStream in) throws IOException + protected Long confirming(ExtendedDataInputStream in) throws Exception { long serverTime = in.readLong(); long clientTime1 = System.currentTimeMillis(); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ExceptionTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ExceptionTest.java index 8f922d53df..88027ba7a9 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ExceptionTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ExceptionTest.java @@ -12,8 +12,12 @@ package org.eclipse.net4j.tests; import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.signal.SignalRemoteException; +import org.eclipse.net4j.tests.signal.ExceptionIndication; import org.eclipse.net4j.tests.signal.ExceptionRequest; import org.eclipse.net4j.tests.signal.TestSignalProtocol; +import org.eclipse.net4j.util.io.IOUtil; + +import java.rmi.AlreadyBoundException; /** * @author Eike Stepper @@ -47,6 +51,10 @@ public class ExceptionTest extends AbstractProtocolTest } catch (SignalRemoteException success) { + IOUtil.print(success); + ClassNotFoundException cnfe = (ClassNotFoundException)success.getCause(); + AlreadyBoundException abe = (AlreadyBoundException)cnfe.getCause(); + assertEquals(ExceptionIndication.SIMULATED_EXCEPTION, abe.getMessage()); } } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayIndication.java index 0ef0ba41a8..cea34a3d22 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayIndication.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayIndication.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -29,13 +28,13 @@ public class ArrayIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { data = in.readByteArray(); } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { out.writeByteArray(data); } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java index 831d2db543..0eca61f29e 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -31,13 +30,13 @@ public class ArrayRequest extends RequestWithConfirmation<byte[]> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeByteArray(data); } @Override - protected byte[] confirming(ExtendedDataInputStream in) throws IOException + protected byte[] confirming(ExtendedDataInputStream in) throws Exception { return in.readByteArray(); } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncIndication.java index c78ecb7a90..f1dab4ed81 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncIndication.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncIndication.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.signal.Indication; import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataInputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -34,7 +33,7 @@ public class AsyncIndication extends Indication } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { data = in.readString(); } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java index 18c670ce3d..2f0c780b28 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -30,7 +29,7 @@ public class AsyncRequest extends Request } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeString(data); } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionIndication.java index 1a5d5e8c32..9344cd0b2b 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionIndication.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionIndication.java @@ -14,7 +14,7 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; +import java.rmi.AlreadyBoundException; /** * @author Eike Stepper @@ -36,7 +36,7 @@ public class ExceptionIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { exceptionInIndicating = in.readBoolean(); if (exceptionInIndicating) @@ -46,7 +46,7 @@ public class ExceptionIndication extends IndicationWithResponse } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { if (!exceptionInIndicating) { @@ -56,8 +56,20 @@ public class ExceptionIndication extends IndicationWithResponse out.writeBoolean(true); } - private void throwException() throws RuntimeException + private void throwException() throws Exception { - throw new RuntimeException(SIMULATED_EXCEPTION); + try + { + throwNestedException(); + } + catch (Exception ex) + { + throw new ClassNotFoundException(SIMULATED_EXCEPTION, ex); + } + } + + private void throwNestedException() throws Exception + { + throw new AlreadyBoundException(SIMULATED_EXCEPTION); } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionRequest.java index aebb023872..00ccbe6940 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionRequest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionRequest.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -30,13 +29,13 @@ public class ExceptionRequest extends RequestWithConfirmation<Boolean> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeBoolean(exceptionInIndicating); } @Override - protected Boolean confirming(ExtendedDataInputStream in) throws IOException + protected Boolean confirming(ExtendedDataInputStream in) throws Exception { return in.readBoolean(); } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailIndication.java index a204165860..25f71c2ea0 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailIndication.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailIndication.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -34,13 +33,13 @@ public class IntFailIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { data = in.readInt(); } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { getProtocol().deactivate(); } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java index fd5f194db2..863088446a 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -30,13 +29,13 @@ public class IntFailRequest extends RequestWithConfirmation<Integer> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeInt(data); } @Override - protected Integer confirming(ExtendedDataInputStream in) throws IOException + protected Integer confirming(ExtendedDataInputStream in) throws Exception { return in.readInt(); } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntIndication.java index c9c14ad6fe..4597bde668 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntIndication.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntIndication.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -29,13 +28,13 @@ public class IntIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { data = in.readInt(); } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { out.writeInt(data); } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java index ed92b9d788..36b728f732 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -30,13 +29,13 @@ public class IntRequest extends RequestWithConfirmation<Integer> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeInt(data); } @Override - protected Integer confirming(ExtendedDataInputStream in) throws IOException + protected Integer confirming(ExtendedDataInputStream in) throws Exception { return in.readInt(); } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringIndication.java index 27fa26c0be..a496bfea30 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringIndication.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringIndication.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -29,13 +28,13 @@ public class StringIndication extends IndicationWithResponse } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { data = in.readString(); } @Override - protected void responding(ExtendedDataOutputStream out) throws IOException + protected void responding(ExtendedDataOutputStream out) throws Exception { out.writeString(data); } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java index 03357abb0a..81c68b66df 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java @@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; /** * @author Eike Stepper @@ -31,13 +30,13 @@ public class StringRequest extends RequestWithConfirmation<String> } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeString(data); } @Override - protected String confirming(ExtendedDataInputStream in) throws IOException + protected String confirming(ExtendedDataInputStream in) throws Exception { return in.readString(); } diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF index 6bd7652f40..e5c660af87 100644 --- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF @@ -62,3 +62,4 @@ Export-Package: org.eclipse.internal.net4j;version="2.0.0"; org.eclipse.net4j.signal.failover;version="2.0.0", org.eclipse.net4j.signal.wrapping;version="2.0.0", org.eclipse.spi.net4j;version="2.0.0" +Eclipse-BuddyPolicy: registered diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java index 89f2c945ce..7e7e9aacc6 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java @@ -14,12 +14,12 @@ import org.eclipse.net4j.buffer.BufferInputStream; import org.eclipse.net4j.buffer.BufferOutputStream; import org.eclipse.net4j.util.ReflectUtil; import org.eclipse.net4j.util.StringUtil; +import org.eclipse.net4j.util.WrappedException; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.internal.net4j.bundle.OM; -import java.io.IOException; import java.io.InputStream; /** @@ -51,14 +51,17 @@ public abstract class Indication extends SignalReactor { indicating(ExtendedDataInputStream.wrap(wrappedInputStream)); } - catch (IOException ex) + catch (Error ex) { + OM.LOG.error(ex); + sendExceptionSignal(ex); throw ex; } catch (Exception ex) { + ex = WrappedException.unwrap(ex); OM.LOG.error(ex); - sendExceptionMessage(ex); + sendExceptionSignal(ex); throw ex; } finally @@ -67,21 +70,21 @@ public abstract class Indication extends SignalReactor } } - protected abstract void indicating(ExtendedDataInputStream in) throws IOException; + protected abstract void indicating(ExtendedDataInputStream in) throws Exception; /** * @since 2.0 */ - protected String getMessage(Exception ex) + protected String getMessage(Throwable t) { - return StringUtil.formatException(ex); + return StringUtil.formatException(t); } - void sendExceptionMessage(Exception ex) throws Exception + void sendExceptionSignal(Throwable t) throws Exception { SignalProtocol<?> protocol = getProtocol(); int correlationID = -getCorrelationID(); - String message = getMessage(ex); - new ExceptionMessageRequest(protocol, correlationID, message).send(); + String message = getMessage(t); + new RemoteExceptionRequest(protocol, correlationID, message, t).send(); } } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java index 44e2dafd09..5c16fb3c29 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java @@ -13,12 +13,12 @@ package org.eclipse.net4j.signal; import org.eclipse.net4j.buffer.BufferInputStream; import org.eclipse.net4j.buffer.BufferOutputStream; import org.eclipse.net4j.util.ReflectUtil; +import org.eclipse.net4j.util.WrappedException; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.internal.net4j.bundle.OM; -import java.io.IOException; import java.io.OutputStream; /** @@ -51,14 +51,17 @@ public abstract class IndicationWithResponse extends Indication { responding(ExtendedDataOutputStream.wrap(wrappedOutputStream)); } - catch (IOException ex) + catch (Error ex) { + OM.LOG.error(ex); + sendExceptionSignal(ex); throw ex; } catch (Exception ex) { + ex = WrappedException.unwrap(ex); OM.LOG.error(ex); - sendExceptionMessage(ex); + sendExceptionSignal(ex); throw ex; } finally @@ -73,6 +76,7 @@ public abstract class IndicationWithResponse extends Indication /** * <b>Important Note:</b> The response must not be empty, i.e. the stream must be used at least to write a * <code>boolean</code>. Otherwise synchronization problems will result! + * @throws Exception TODO */ - protected abstract void responding(ExtendedDataOutputStream out) throws IOException; + protected abstract void responding(ExtendedDataOutputStream out) throws Exception; } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/ExceptionMessageIndication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.java index 9a7523db9c..de18a1b3bb 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/ExceptionMessageIndication.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.java @@ -12,23 +12,34 @@ package org.eclipse.net4j.signal; import org.eclipse.net4j.util.io.ExtendedDataInputStream; -import java.io.IOException; +import org.eclipse.internal.net4j.bundle.OM; /** * @author Eike Stepper */ -class ExceptionMessageIndication extends Indication +class RemoteExceptionIndication extends Indication { - public ExceptionMessageIndication(SignalProtocol<?> protocol) + public RemoteExceptionIndication(SignalProtocol<?> protocol) { - super(protocol, SignalProtocol.SIGNAL_EXCEPTION_MESSAGE); + super(protocol, SignalProtocol.SIGNAL_REMOTE_EXCEPTION); } @Override - protected void indicating(ExtendedDataInputStream in) throws IOException + protected void indicating(ExtendedDataInputStream in) throws Exception { int correlationID = in.readInt(); String message = in.readString(); - getProtocol().stopSignal(correlationID, message); + Throwable t; + + try + { + t = (Throwable)in.readObject(OM.class.getClassLoader()); + } + catch (Throwable couldNotLoadExceptionClass) + { + t = new SignalRemoteException(message); + } + + getProtocol().stopSignal(correlationID, t); } } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/ExceptionMessageRequest.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java index b529df2992..8dd6f083f0 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/ExceptionMessageRequest.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java @@ -12,28 +12,30 @@ package org.eclipse.net4j.signal; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import java.io.IOException; - /** * @author Eike Stepper */ -class ExceptionMessageRequest extends Request +class RemoteExceptionRequest extends Request { private int correlationID; private String message; - public ExceptionMessageRequest(SignalProtocol<?> protocol, int correlationID, String message) + private Throwable t; + + public RemoteExceptionRequest(SignalProtocol<?> protocol, int correlationID, String message, Throwable t) { - super(protocol, SignalProtocol.SIGNAL_EXCEPTION_MESSAGE); + super(protocol, SignalProtocol.SIGNAL_REMOTE_EXCEPTION); this.correlationID = correlationID; this.message = message; + this.t = t; } @Override - protected void requesting(ExtendedDataOutputStream out) throws IOException + protected void requesting(ExtendedDataOutputStream out) throws Exception { out.writeInt(correlationID); out.writeString(message); + out.writeObject(t); } } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java index 4f38651d61..e79a162163 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java @@ -18,7 +18,6 @@ import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.internal.net4j.bundle.OM; -import java.io.IOException; import java.io.OutputStream; /** @@ -50,5 +49,5 @@ public abstract class Request extends SignalActor out.flushWithEOS(); } - protected abstract void requesting(ExtendedDataOutputStream out) throws IOException; + protected abstract void requesting(ExtendedDataOutputStream out) throws Exception; } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java index db3d3cdb05..a5d47735ce 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java @@ -18,7 +18,6 @@ import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.internal.net4j.bundle.OM; -import java.io.IOException; import java.io.InputStream; /** @@ -38,14 +37,14 @@ public abstract class RequestWithConfirmation<RESULT> extends Request @Override @SuppressWarnings("unchecked") - public RESULT send() throws Exception + public RESULT send() throws Exception, SignalRemoteException { return (RESULT)super.send(); } @Override @SuppressWarnings("unchecked") - public RESULT send(long timeout) throws Exception + public RESULT send(long timeout) throws Exception, SignalRemoteException { return (RESULT)super.send(timeout); } @@ -68,11 +67,24 @@ public abstract class RequestWithConfirmation<RESULT> extends Request /** * <b>Important Note:</b> The confirmation must not be empty, i.e. the stream must be used at least to read a * <code>boolean</code>. Otherwise synchronization problems will result! + * + * @throws Exception + * TODO */ - protected abstract RESULT confirming(ExtendedDataInputStream in) throws IOException; + protected abstract RESULT confirming(ExtendedDataInputStream in) throws Exception; - void setExceptionMessage(String message) + void setRemoteException(Throwable t) { - getBufferInputStream().setException(new SignalRemoteException(message)); + SignalRemoteException remoteException; + if (t instanceof SignalRemoteException) + { + remoteException = (SignalRemoteException)t; + } + else + { + remoteException = new SignalRemoteException(t); + } + + getBufferInputStream().setException(remoteException); } } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java index 6e4eea4184..7e30b589ae 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java @@ -35,12 +35,12 @@ public abstract class SignalActor extends Signal setCorrelationID(protocol.getNextCorrelationID()); } - public Object send() throws Exception + public Object send() throws Exception, SignalRemoteException { return send(NO_TIMEOUT); } - public Object send(long timeout) throws Exception + public Object send(long timeout) throws Exception, SignalRemoteException { if (terminated) { 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 a9368de4a5..5c2fb306f4 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 @@ -43,7 +43,7 @@ public abstract class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STR /** * @since 2.0 */ - public static final short SIGNAL_EXCEPTION_MESSAGE = -1; + public static final short SIGNAL_REMOTE_EXCEPTION = -1; private static final int MIN_CORRELATION_ID = 1; @@ -245,9 +245,9 @@ public abstract class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STR protected final SignalReactor provideSignalReactor(short signalID) { checkActive(); - if (signalID == SIGNAL_EXCEPTION_MESSAGE) + if (signalID == SIGNAL_REMOTE_EXCEPTION) { - return new ExceptionMessageIndication(this); + return new RemoteExceptionIndication(this); } SignalReactor signal = createSignalReactor(signalID); @@ -314,7 +314,7 @@ public abstract class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STR } } - void stopSignal(int correlationID, String message) + void stopSignal(int correlationID, Throwable t) { synchronized (signals) { @@ -322,7 +322,7 @@ public abstract class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STR if (signal instanceof RequestWithConfirmation) { RequestWithConfirmation<?> request = (RequestWithConfirmation<?>)signal; - request.setExceptionMessage(message); + request.setRemoteException(t); } signals.notifyAll(); diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/AbstractFailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/AbstractFailOverStrategy.java index ec56cbcddf..ff782e1d45 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/AbstractFailOverStrategy.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/AbstractFailOverStrategy.java @@ -12,6 +12,7 @@ package org.eclipse.net4j.signal.failover; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.signal.SignalActor; +import org.eclipse.net4j.signal.SignalRemoteException; import org.eclipse.net4j.util.event.Notifier; /** @@ -36,7 +37,7 @@ public abstract class AbstractFailOverStrategy extends Notifier implements IFail this.defaultTimeout = defaultTimeout; } - public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request) throws Exception + public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request) throws Exception, SignalRemoteException { return send(request, defaultTimeout); } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/FailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/FailOverStrategy.java index 9774c06e3d..242824fcc6 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/FailOverStrategy.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/FailOverStrategy.java @@ -14,6 +14,7 @@ import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.signal.SignalProtocol; +import org.eclipse.net4j.signal.SignalRemoteException; import org.eclipse.net4j.util.CheckUtil; import java.util.concurrent.TimeoutException; @@ -27,7 +28,8 @@ public abstract class FailOverStrategy extends AbstractFailOverStrategy { } - public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request, long timeout) throws Exception + public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request, long timeout) throws Exception, + SignalRemoteException { for (;;) { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverStrategy.java index c156202e86..245e57663a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverStrategy.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverStrategy.java @@ -11,6 +11,7 @@ package org.eclipse.net4j.signal.failover; import org.eclipse.net4j.signal.RequestWithConfirmation; +import org.eclipse.net4j.signal.SignalRemoteException; import org.eclipse.net4j.util.event.INotifier; /** @@ -28,7 +29,8 @@ public interface IFailOverStrategy extends INotifier */ public void setDefaultTimeout(long defaultTimeout); - public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request) throws Exception; + public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request) throws Exception, SignalRemoteException; - public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request, long timeout) throws Exception; + public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request, long timeout) throws Exception, + SignalRemoteException; } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/NOOPFailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/NOOPFailOverStrategy.java index c717ba5b31..689675c1aa 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/NOOPFailOverStrategy.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/NOOPFailOverStrategy.java @@ -11,6 +11,7 @@ package org.eclipse.net4j.signal.failover; import org.eclipse.net4j.signal.RequestWithConfirmation; +import org.eclipse.net4j.signal.SignalRemoteException; import org.eclipse.net4j.util.event.IListener; /** @@ -22,7 +23,8 @@ public class NOOPFailOverStrategy extends AbstractFailOverStrategy { } - public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request, long timeout) throws Exception + public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request, long timeout) throws Exception, + SignalRemoteException { return request.send(timeout); } @@ -30,10 +32,12 @@ public class NOOPFailOverStrategy extends AbstractFailOverStrategy @Override public void addListener(IListener listener) { + // Do nothing } @Override public void removeListener(IListener listener) { + // Do nothing } } |