Changeset 244

Timestamp:

07/12/13 16:26:31 (10 years ago)

Author:

bowman

Message:

Added an example of how to deal with contested cw's (obtained from the cache or otherwise).

Location:

trunk/src/com/bowman/cardserv

Files:

• session/AbstractSession.java (modified) (1 diff)
• web/GHttpBackend.java (modified) (1 diff)

trunk/src/com/bowman/cardserv/session/AbstractSession.java

@@ -361 +361 @@
       }
 
+      if(ecmReply.isContested()) {
+        boolean saved = false;
+        if(lastTransaction != null) {
+          CamdNetMessage prevDcw = lastTransaction.getReply();
+          if(!prevDcw.isEmpty()) {
+            Set candidates = new HashSet(ecmReply.getCandidates());
+            CamdNetMessage c;
+            candidates.add(ecmReply);
+            // if there are multiple candidates, look for one in sequence with the previously sent (only works for single-user/single-tuner clients)
+            for(Iterator iter = candidates.iterator(); iter.hasNext(); ) {
+              c = (CamdNetMessage)iter.next();
+              if(prevDcw.equalsSingleDcw(c)) {
+                saved = true;
+                ecmReply = c;
+                break;
+              }
+            }
+          }
+        }
+        if(saved) {
+          setFlag(ecmRequest, '!');
+        } else {
+          setFlag(ecmRequest, '?');
+          logger.warning("Client encountered contested cw: " + ecmReply.toDebugString() + " (alternatives: " + ecmReply.getCandidates() + ")");
+        }
+      }
+
       ecmRequest = ((EcmTransaction)transactions.get(ecmRequest)).getRequest(); // make sure original instance is used
       if(ecmRequest.getCommandTag() != ecmReply.getCommandTag()) { // ensure table id is same as it was in request

trunk/src/com/bowman/cardserv/web/GHttpBackend.java

@@ -343 +343 @@
       } else throw new IOException("Invalid content length (" + content.length + ")");
     } catch (GHttpAuthException e) {
-      return getErrorResponse(403, "Forbidden");
+      return e.getResponse();
     } catch (Exception e) {
       parent.logger.throwing("Bad ghttp feeder request: " + req.getQueryString(), e);