Changeset 9 for protocol/src/main/java/geniusweb/protocol/session/saop/SAOP.java

Timestamp:

11/28/19 14:40:48 (5 years ago)

Author:

bart

Message:

Release 1.1.0

File:

• protocol/src/main/java/geniusweb/protocol/session/saop/SAOP.java (modified) (8 diffs)

protocol/src/main/java/geniusweb/protocol/session/saop/SAOP.java

@@ -23 +23 @@
 import geniusweb.protocol.CurrentNegoState;
 import geniusweb.protocol.ProtocolException;
-import geniusweb.protocol.partyconnection.ConnectionWithParty;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.protocol.session.SessionProtocol;
 import geniusweb.protocol.session.SessionSettings;
@@ -95 +95 @@
         @Override
         public synchronized void start(
-                        ConnectionWithPartyFactory connectionfactory) {
+                        ProtocolToPartyConnFactory connectionfactory) {
 
                 try {
@@ -151 +151 @@
          */
         protected synchronized void connect(
-                        ConnectionWithPartyFactory connectionfactory)
+                        ProtocolToPartyConnFactory connectionfactory)
                         throws InterruptedException, IOException {
                 List<PartyWithProfile> participants = state.getSettings()
@@ -158 +158 @@
                                 .map(parti -> (parti.getParty().getPartyRef()))
                                 .collect(Collectors.toList());
-                List<ConnectionWithParty> connections = null;
+                List<ProtocolToPartyConn> connections = null;
                 log.log(Level.INFO, "SAOP connect " + parties);
                 while (connections == null) {
@@ -218 +218 @@
          */
         protected synchronized void setupParties() throws ProtocolException {
-                for (ConnectionWithParty conn : state.getConnections()) {
+                for (ProtocolToPartyConn conn : state.getConnections()) {
                         conn.addListener(action -> actionRequest(conn, action));
                 }
 
-                for (ConnectionWithParty connection : state.getConnections()) {
+                for (ProtocolToPartyConn connection : state.getConnections()) {
                         try {
                                 sendSettings(connection);
@@ -239 +239 @@
          * @throws IOException if party got disconnected
          */
-        private synchronized void sendSettings(ConnectionWithParty connection)
+        private synchronized void sendSettings(ProtocolToPartyConn connection)
                         throws IOException {
                 PartyId partyid = connection.getParty();
@@ -261 +261 @@
          */
         protected synchronized void actionRequest(
-                        final ConnectionWithParty partyconn, final Action action) {
+                        final ProtocolToPartyConn partyconn, final Action action) {
                 if (action == null) {
-                        handleError(partyconn
-                                        + " did null action, breaching the protocol. Closing session",
-                                        partyconn.getParty().getName(), null);
+                        Throwable err = partyconn.getError();
+                        if (err == null) {
+                                err = new ProtocolException("Party sent a null action",
+                                                partyconn.getParty().getName());
+                        }
+                        handleError(partyconn + "Protocol error",
+                                        partyconn.getParty().getName(), err);
                         return;
                 }
@@ -348 +352 @@
                         return;
                 Inform finished = new Finished(state.getAgreement());
-                for (ConnectionWithParty conn : state.getConnections()) {
+                for (ProtocolToPartyConn conn : state.getConnections()) {
                         sendFinish(conn, finished);
                 }
-                notifyChange(new CurrentNegoState(state));
-        }
-
-        private void sendFinish(ConnectionWithParty connection, Inform finished) {
+                notifyListeners(new CurrentNegoState(state));
+        }
+
+        private void sendFinish(ProtocolToPartyConn connection, Inform finished) {
                 try {
                         connection.send(finished);