[java-opensaml] branch master updated: Revert change to ClientStorageService.

[Brent Putman]

This is an automated email from the git hooks/post-receive script.

putmanb pushed a commit to branch master
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=45bdcb3d25b391c7389fafab9b0c4888c61bfb98

The following commit(s) were added to refs/heads/master by this push:
       new  45bdcb3   Revert change to ClientStorageService.
45bdcb3 is described below

commit 45bdcb3d25b391c7389fafab9b0c4888c61bfb98
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Sat Feb 15 15:39:29 2020 -0500

    Revert change to ClientStorageService.
    
    This partially reverts 9ad211c1c8d071c13ef220583d55553e1b93b612.
---
 .../opensaml/storage/impl/client/ClientStorageService.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java
index 37021a0..c243f61 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java
@@ -156,14 +156,20 @@ public class ClientStorageService extends AbstractMapBackedStorageService implem
     }
     
     /** {@inheritDoc} */
+    // Checkstyle: CyclomaticComplexity ON
+    
+    /** {@inheritDoc} */
     public boolean isServerSide() {
         return false;
     }
+    
+    /** {@inheritDoc} */
 
     /** {@inheritDoc} */
     public boolean isClustered() {
         return true;
     }
+    
 
     /**
      * Set the servlet request in which to manage per-request data.
@@ -544,7 +550,8 @@ public class ClientStorageService extends AbstractMapBackedStorageService implem
                 return;
             }
             
-            try (final JsonReader reader = Json.createReader(new StringReader(raw))) {
+            try {
+                final JsonReader reader = Json.createReader(new StringReader(raw));
                 final JsonStructure st = reader.read();
                 if (!(st instanceof JsonObject)) {
                     throw new JsonException("Found invalid data structure while parsing context map");
@@ -644,8 +651,9 @@ public class ClientStorageService extends AbstractMapBackedStorageService implem
             final long now = System.currentTimeMillis();
             boolean empty = true;
 
-            try (final StringWriter sink = new StringWriter(128);
-                    final JsonGenerator gen = Json.createGenerator(sink)) {
+            try {
+                final StringWriter sink = new StringWriter(128);
+                final JsonGenerator gen = Json.createGenerator(sink);
                 
                 gen.writeStartObject();
                 for (final Map.Entry<String,Map<String, MutableStorageRecord<?>>> context : contextMap.entrySet()) {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.