Changeset 233 for trunk

Timestamp:

Nov 12, 2007, 12:09:45 AM (17 years ago)

Author:

ecprice

Message:

Actually close the connection on disconnect, fixing #3.

Location:

trunk/vnc/vnc_javasrc

Files:

• RfbProto.java (modified) (3 diffs)
• SocketWrapper.java (modified) (4 diffs, 1 prop)

trunk/vnc/vnc_javasrc/RfbProto.java

@@ -209 +209 @@
 
     if (viewer.socketFactory == null) {
+        System.out.println("Null socketFactory");
       sock = new Socket(host, port);
     } else {
@@ -214 +215 @@
         Class factoryClass = Class.forName(viewer.socketFactory);
         SocketFactory factory = (SocketFactory)factoryClass.newInstance();
+        System.out.println("Using socketFactory " + factory);
         if (viewer.inAnApplet)
           sock = factory.createSocket(host, port, viewer);
@@ -237 +239 @@
       sock.close();
       closed = true;
-      System.out.println("RFB socket closed");
+      System.out.println("RFB socket closed " + sock);
       if (rec != null) {
         rec.close();

trunk/vnc/vnc_javasrc/SocketWrapper.java

@@ -38 +38 @@
         super(new WrappingSocketImpl(delegate));
         this.delegate = delegate;
+        System.out.println("Creating SocketWrapper $Rev$");
     }
 
@@ -137 +138 @@
 
         protected void close() throws IOException {
+            System.out.println("Calling delegate.close");
             delegate.close();
         }
@@ -241 +243 @@
     }
 
+    public void close() throws IOException {
+        System.out.println("Calling SocketWrapper.delegate.close");
+        delegate.close();
+    }
+
     public boolean equals(Object obj) {
         if (!(obj instanceof SocketWrapper)) return false;
@@ -250 +257 @@
         return delegate.hashCode() ^ 0x01010101;
     }
+    public String toString() {
+        return "<SocketWrapper " + super.toString() + "(delegating to " + delegate.toString() +  ")" + ">";
+    }
 }