Changeset 2945 for SRUClient

Timestamp:

05/28/13 09:48:39 (11 years ago)

Author:

oschonef

Message:

• make sure, we don't leak XMLStreamReaders in case of string record packing

File:

• SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUSimpleClient.java (modified) (4 diffs)

SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUSimpleClient.java

@@ -571 +571 @@
                     throw new SRUClientException(
                             "error parsing explain record", e);
+                } finally {
+                    /*
+                     * make sure, we're deallocate the record reader in case of
+                     * string record packing
+                     */
+                    if (packing == SRURecordPacking.STRING) {
+                        recordReader.closeCompletly();
+                    }
                 }
                 if (recordData == null) {
@@ -576 +584 @@
                     throw new SRUClientException(
                             "error parsing explain record");
-                }
-                if (packing == SRURecordPacking.STRING) {
-                    recordReader.closeCompletly();
                 }
                 reader.consumeWhitespace();
@@ -1024 +1029 @@
                                         throw new SRUClientException(
                                                 "error parsing record", e);
+                                    } finally {
+                                        /*
+                                         * make sure, we deallocate the record
+                                         * reader in case of string record
+                                         * packing
+                                         */
+                                        if (packing == SRURecordPacking.STRING) {
+                                            recordReader.closeCompletly();
+                                        }
                                     }
                                     if (recordData == null) {
@@ -1056 +1070 @@
                                                     schema + "' found.");
                                 }
-                            }
-
-                            if (packing == SRURecordPacking.STRING) {
-                                recordReader.closeCompletly();
                             }