scala 改回11.7版本，同步块修改

isuwang · Nov 28, 2017 · 9f1ded9 · 9f1ded9
1 parent b70b679
commit 9f1ded9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/dapeng-code-generator/pom.xml b/dapeng-code-generator/pom.xml
@@ -14,8 +14,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java-version>1.8</java-version>
-        <scala.version>2.12.2</scala.version>
-        <scala.binary.version>2.12.2</scala.binary.version>
+        <scala.version>2.11.7</scala.version>
+        <scala.binary.version>2.11.7</scala.binary.version>
     </properties>
 
     <dependencies>

diff --git a/...ting/dapeng-remoting-netty/src/main/java/com/isuwang/dapeng/remoting/netty/SoaClient.java b/...ting/dapeng-remoting-netty/src/main/java/com/isuwang/dapeng/remoting/netty/SoaClient.java
@@ -135,7 +135,11 @@ private synchronized Channel connect(String host, int port) throws Exception {
             synchronized (byteBufs) {
                 byteBufs[0] = msg;
 
-                byteBufs.notify();
+                byteBufs = caches.get(String.valueOf(seqid));
+                // if peer wait    byebuffs != null   if peer out of synchornized, bytebuffs == null
+                if(byteBufs != null) {
+                    byteBufs.notify();
+                }
             }
         }
     };
@@ -158,24 +162,20 @@ public ByteBuf send(int seqid, ByteBuf request) throws Exception {
 
         caches.put(String.valueOf(seqid), byteBufs);
 
-        try {
-            channel.writeAndFlush(request);
+        synchronized (byteBufs) {
+            try {
+                channel.writeAndFlush(request);
 
-            //等待返回结果，soaClientHandler会将结果写入caches并释放锁，此时返回
-            synchronized (byteBufs) {
+                //等待返回结果，soaClientHandler会将结果写入caches并释放锁，此时返回
                 if (byteBufs[0] != null)
                     return byteBufs[0];
 
-                try {
-                    byteBufs.wait(50000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
+                byteBufs.wait(50000);
 
-            return byteBufs[0];
-        } finally {
-            caches.remove(String.valueOf(seqid));
+                return byteBufs[0];
+            } finally {
+                caches.remove(String.valueOf(seqid));
+            }
         }
     }