Skip to content

Commit 2abd232

Browse files
authored
Merge pull request #1 from mcoolive/patch-1
Better implementation to protect cache.
2 parents cf8528a + 9b64550 commit 2abd232

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

core/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@
2525
<artifactId>java-driver-parent</artifactId>
2626
<version>4.17.1-SNAPSHOT</version>
2727
</parent>
28+
<groupId>fr.yuzer</groupId>
2829
<artifactId>java-driver-core</artifactId>
30+
<version>4.15.1</version>
2931
<packaging>bundle</packaging>
3032
<name>Apache Cassandra Java Driver - core</name>
3133
<dependencyManagement>
3234
<dependencies>
3335
<dependency>
34-
<groupId>${project.groupId}</groupId>
36+
<groupId>com.datastax.oss</groupId>
3537
<artifactId>java-driver-bom</artifactId>
36-
<version>${project.version}</version>
38+
<version>4.15.0</version>
3739
<type>pom</type>
3840
<scope>import</scope>
3941
</dependency>

core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlPrepareAsyncProcessor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,9 @@ public CompletionStage<PreparedStatement> process(
163163
});
164164
}
165165
}
166-
return result;
166+
// Return a defensive copy. So if a client cancels its request, the cache won't be impacted
167+
// nor a potential concurrent request.
168+
return result.thenApply(x -> x); // copy() is available only since Java 9
167169
} catch (ExecutionException e) {
168170
return CompletableFutures.failedFuture(e.getCause());
169171
}

pom.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
892892
</supportedProjectTypes>
893893
</configuration>
894894
</plugin>
895-
<plugin>
895+
<!-- plugin>
896896
<groupId>org.revapi</groupId>
897897
<artifactId>revapi-maven-plugin</artifactId>
898898
<executions>
@@ -902,13 +902,13 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
902902
</goals>
903903
<configuration>
904904
<analysisConfigurationFiles>
905-
<!-- Present at the root of each module that doesn't skip this goal -->
905+
<!- Present at the root of each module that doesn't skip this goal ->
906906
<analysisConfigurationFile>revapi.json</analysisConfigurationFile>
907907
</analysisConfigurationFiles>
908908
</configuration>
909909
</execution>
910910
</executions>
911-
</plugin>
911+
</plugin -->
912912
</plugins>
913913
</build>
914914
<profiles>
@@ -998,9 +998,13 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
998998
</profile>
999999
</profiles>
10001000
<distributionManagement>
1001-
<repository>
1001+
<!-- repository>
10021002
<id>ossrh</id>
10031003
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
1004+
</repository -->
1005+
<repository>
1006+
<id>yuzer</id>
1007+
<url>https://maven.pkg.github.com/yuzer-software/yuzer-boot</url>
10041008
</repository>
10051009
</distributionManagement>
10061010
<licenses>

0 commit comments

Comments
 (0)