Issue #2854: Fix merge of textdb

Change-Id: I626eabc72fbedde983e592ec0c8fb50ed1f52ae3

Former-commit-id: 559907c32d [formerly 1dc654c20e] [formerly 559907c32d [formerly 1dc654c20e] [formerly dd35516290 [formerly 2335691bb79c14d96e286f9b0be0f5085711c7bc]]]
Former-commit-id: dd35516290
Former-commit-id: d6805f94d3 [formerly 93520a29d3]
Former-commit-id: 2abb1ca090
This commit is contained in:
Richard Peter 2014-05-12 17:30:57 -05:00
parent a36c40491f
commit 8ea97f96ac

View file

@ -119,7 +119,7 @@ public class TextDBSrvWrapper {
int tries = 0;
byte[] bytesOut = null;
while (tries < 2) {
while ((bytesOut == null) && (tries < 2)) {
try {
ByteArrayOutputStream baos = ByteArrayOutputStreamPool
.getInstance().getStream();