Fix requestChannel generator

netifi-proteus · May 16, 2018 · cd4cc25 · cd4cc25
1 parent 0d577cf
commit cd4cc25
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -9,8 +9,8 @@ dependencies {
     compile 'com.google.protobuf:protobuf-java:3.5.0'
     compile 'com.google.protobuf:protobuf-java-util:3.5.0'
 
-    compile 'io.rsocket:rsocket-core:0.11.2'
-    compile 'io.rsocket:rsocket-transport-netty:0.11.2'
+    compile 'io.rsocket:rsocket-core:0.11.3'
+    compile 'io.rsocket:rsocket-transport-netty:0.11.3'
     compile 'io.micrometer:micrometer-core:1.0.3'
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 group=io.netifi.proteus
-version=0.6.1
+version=0.6.2
diff --git a/gradle/java.gradle b/gradle/java.gradle
@@ -57,8 +57,8 @@ dependencies {
     testCompile 'org.apache.logging.log4j:log4j-api:2.8.2'
     testCompile 'org.apache.logging.log4j:log4j-core:2.8.2'
     testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.8.2'
-    testCompile 'io.rsocket:rsocket-transport-netty:0.11.2'
-    testCompile 'io.rsocket:rsocket-transport-local:0.11.2'
+    testCompile 'io.rsocket:rsocket-transport-netty:0.11.3'
+    testCompile 'io.rsocket:rsocket-transport-local:0.11.3'
     testCompile 'org.mockito:mockito-all:1.10.19'
 }
 

diff --git a/protobuf-rpc/src/java_plugin/cpp/java_generator.cpp b/protobuf-rpc/src/java_plugin/cpp/java_generator.cpp
@@ -578,14 +578,14 @@ static void PrintClient(const ServiceDescriptor* service,
       p->Indent();
       p->Print(
           *vars,
-          "boolean once;\n\n"
+          "private final $AtomicBoolean$ once = new $AtomicBoolean$(false);\n\n"
           "@$Override$\n"
           "public $Payload$ apply($MessageLite$ message) {\n");
       p->Indent();
       p->Print(
           *vars,
           "$ByteBuf$ data = serialize(message);\n"
-          "if (!once) {\n");
+          "if (once.compareAndSet(false, true)) {\n");
       p->Indent();
       p->Print(
           *vars,
@@ -1335,6 +1335,7 @@ void GenerateClient(const ServiceDescriptor* service,
   vars["from"] = "from";
   vars["Function"] = "java.util.function.Function";
   vars["Supplier"] = "java.util.function.Supplier";
+  vars["AtomicBoolean"] = "java.util.concurrent.atomic.AtomicBoolean";
   vars["Override"] = "java.lang.Override";
   vars["Publisher"] = "org.reactivestreams.Publisher";
   vars["Generated"] = "javax.annotation.Generated";