fix bug timeroutcallback transportOptions null point

sunchenliang · Dec 11, 2012 · d78b257 · d78b257
1 parent 988fc6f
commit d78b257
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 26 deletions.
diff --git a/SimpleClient/MainPage.xaml.cs b/SimpleClient/MainPage.xaml.cs
@@ -200,6 +200,10 @@ private void setFilterBt_Click(object sender, RoutedEventArgs e)
             ja.Add("[email protected]");
             valueArray.SetValues(ja);
             filter.SetInValue(valueArray);
+
+            Debug.WriteLine("\n-- set filer --");
+            Debug.WriteLine(filter);
+            Debug.WriteLine("---------------\n");
 
             //Remove the filter.
             //HCondition filter = new HCondition(JObject.Parse("{}")); 
@@ -237,8 +241,5 @@ private void clearBt_Message_Click(object sender, RoutedEventArgs e)
             Update_TextBlock_UI(msgScreen, "clear");
         }
 
-
-
-
     }
 }
diff --git a/SimpleClient/SimpleClient.csproj b/SimpleClient/SimpleClient.csproj
@@ -143,9 +143,8 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\MyGit\socketio_w8\SocketIO4Net\packages\Newtonsoft.Json.4.5.10\lib\winrt45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\..\..\libs\Newtonsoft.Json.dll</HintPath>
     </Reference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">

diff --git a/SimpleClient/SimpleClient.csproj.user b/SimpleClient/SimpleClient.csproj.user
@@ -3,4 +3,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <UseSimulator>True</UseSimulator>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <UseSimulator>True</UseSimulator>
+  </PropertyGroup>
 </Project>
diff --git a/hubiquitus4w8.v11.suo b/hubiquitus4w8.v11.suo
diff --git a/hubiquitus4w8/hapi/client/HClient.cs b/hubiquitus4w8/hapi/client/HClient.cs
@@ -59,6 +59,7 @@ public class HClient
 
         public string FullJid { get { return this.transportOptions.Jid.GetFullJID() ; } }
         public string Resource { get { return this.transportOptions.GetResource() ; } }
+        public ConnectionStatus Status { get { return this.connectionStatus; } }
 
         public delegate void StatusEventHandler(HStatus status);
         public delegate void MessageEventHandler(HMessage message);
@@ -108,7 +109,6 @@ public void Connect(string publisher, string password, HOptions options)
 
             if (shouldConnect)
             {
-                notifyStatus(ConnectionStatus.CONNECTING, ConnectionErrors.NO_ERROR, null);
                 try
                 {
                     fillTransportOptions(publisher, password, options);
@@ -133,6 +133,7 @@ public void Connect(string publisher, string password, HOptions options)
                         this.transportManager.onData = transport_onData;
                         isEventHandlerAdded = true;
                     }
+                    notifyStatus(ConnectionStatus.CONNECTING, ConnectionErrors.NO_ERROR, null);
                     this.transportManager.Connect(this.transportOptions);
                 }
             }
@@ -187,10 +188,7 @@ public void Disconnect()
                 notifyStatus(ConnectionStatus.DISCONNECTED, ConnectionErrors.NOT_CONNECTED, null);
         }
 
-        public ConnectionStatus Status()
-        {
-            return this.connectionStatus;
-        }
+
 
 
         /// <summary>
@@ -225,8 +223,11 @@ public void Send(HMessage message, Action<HMessage> messageDelegate)
                 {
                     message.SetMsgid(Guid.NewGuid().ToString());
                     messageDelegates.Add(message.GetMsgid(), messageDelegate);
-
-                    ThreadPoolTimer timeOutTimer = ThreadPoolTimer.CreateTimer(TimeroutCallback, new TimeSpan(0,0,0,0,message.GetTimeout()));
+
+                    ThreadPoolTimer timeOutTimer = ThreadPoolTimer.CreateTimer((obj) =>
+                    {
+                        notifyResultError(message.GetMsgid(), ResultStatus.EXEC_TIMEOUT, "The response of message is time out.", null);
+                    }, new TimeSpan(0, 0, 0, 0, 2/*message.GetTimeout()*/));
 
                     timerOutDictionary.Add(message.GetMsgid(), timeOutTimer);
                 }
@@ -239,13 +240,6 @@ public void Send(HMessage message, Action<HMessage> messageDelegate)
             transportManager.SendObject(message);
         }
 
-        private void TimeroutCallback(object stateInfo) 
-        {
-            HMessage message = (HMessage)stateInfo;
-            notifyResultError(message.GetMsgid(), ResultStatus.EXEC_TIMEOUT, "The response of message is time out.", null);
-            messageDelegates.Remove(message.GetMsgid());
-        }
-
         /// <summary>
         /// The client MUST be connected to access to this service.
         /// Demands the server a subscription to a channel.

diff --git a/hubiquitus4w8/hapi/hStructures/HOptions.cs b/hubiquitus4w8/hapi/hStructures/HOptions.cs
@@ -180,6 +180,7 @@ public void SetMsgTimeout(int timeout)
                 else
                     this["msgTimeout"] = 30000; //30000s by default
             }
+
             catch (Exception e)
             {
                 Debug.WriteLine("{0} : Can not update the msgTimerout attribute", e.ToString());

diff --git a/hubiquitus4w8/hapi/transport/socketio/HTransportSocketIO.cs b/hubiquitus4w8/hapi/transport/socketio/HTransportSocketIO.cs
@@ -206,7 +206,7 @@ void socketIO_Error(object sender, ErrorEventArgs e)
             string errorMsg = null;
             if (e != null)
             {
-                errorMsg = e.Message;
+                errorMsg = e.ErrorStatus.ToString();
             }
             if (connTimeoutTimer != null)
             {

diff --git a/hubiquitus4w8/hubiquitus4w8.csproj b/hubiquitus4w8/hubiquitus4w8.csproj
@@ -133,14 +133,15 @@
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\MyGit\socketio_w8\SocketIO4Net\packages\Newtonsoft.Json.4.5.10\lib\winrt45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\libs\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="SocketIO4Net, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\libs\SocketIO4Net.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\socketio_w8\SocketIO4Net\SocketIO4Net\SocketIO4Net.csproj">
-      <Project>{27d619fb-a7c1-4366-9b12-283a702d0778}</Project>
-      <Name>SocketIO4Net</Name>
-    </ProjectReference>
+    <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
     <VisualStudioVersion>11.0</VisualStudioVersion>

diff --git a/libs/SocketIO4Net.dll b/libs/SocketIO4Net.dll
-Original file line number
+Diff line change
@@ Expand Up / @@ -180,6 +180,7 @@ public void SetMsgTimeout(int timeout) @@
                     else
                         this["msgTimeout"] = 30000; //30000s by default
                 }
                 catch (Exception e)
                 {
                     Debug.WriteLine("{0} : Can not update the msgTimerout attribute", e.ToString());
@@ Expand Down @@