Skip to content

Commit 7530d46

Browse files
author
chengyitian
committed
AJ-454: fix issue.
1 parent 009002f commit 7530d46

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/com/xxdb/DBConnection.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@ private boolean connect()throws IOException{
245245
return false;
246246
}
247247

248+
String msg = in_.readLine();
249+
248250
isConnected_ = true;
249251

250252
if (line.charAt(endPos + 1) == '0') {
@@ -447,17 +449,15 @@ private Entity run(String script, String scriptType, ProgressListener listener,
447449
if (asynTask_)
448450
return null;
449451

450-
ExtendedDataInput in = remoteLittleEndian_ ? new LittleEndianDataInputStream(new BufferedInputStream(socket_.getInputStream())) :
451-
new BigEndianDataInputStream(new BufferedInputStream(socket_.getInputStream()));
452452
String header = null;
453453
try {
454-
header = in.readLine();
454+
header = in_.readLine();
455455
while (header.equals("MSG")) {
456456
//read intermediate message to indicate the progress
457-
String msg = in.readString();
457+
String msg = in_.readString();
458458
if (listener != null)
459459
listener.progress(msg);
460-
header = in.readLine();
460+
header = in_.readLine();
461461
}
462462
}catch (IOException ex){
463463
isConnected_ = false;
@@ -476,7 +476,7 @@ private Entity run(String script, String scriptType, ProgressListener listener,
476476
int numObject = Integer.parseInt(headers[1]);
477477

478478
try {
479-
header = in.readLine();
479+
header = in_.readLine();
480480
}catch (IOException ex){
481481
isConnected_ = false;
482482
socket_ = null;
@@ -496,7 +496,7 @@ private Entity run(String script, String scriptType, ProgressListener listener,
496496

497497
short flag;
498498
try {
499-
flag = in.readShort();
499+
flag = in_.readShort();
500500
int form = flag >> 8;
501501
int type = flag & 0xff;
502502
boolean extended = type >= 128;
@@ -513,10 +513,10 @@ private Entity run(String script, String scriptType, ProgressListener listener,
513513

514514

515515
if(fetchSize>0 && df == Entity.DATA_FORM.DF_VECTOR && dt == Entity.DATA_TYPE.DT_ANY){
516-
return new EntityBlockReader(in);
516+
return new EntityBlockReader(in_);
517517
}
518518
EntityFactory factory = BasicEntityFactory.instance();
519-
return factory.createEntity(df, dt, in, extended);
519+
return factory.createEntity(df, dt, in_, extended);
520520
}catch (IOException ex){
521521
isConnected_ = false;
522522
socket_ = null;

0 commit comments

Comments
 (0)