Commitd7fb4cc

oleksiys

committed

[1.8.x] + close the transaction, if connection is closed locally

1 parent25002d5 commitd7fb4ccCopy full SHA for d7fb4cc

File tree

+13

-6

lines changed

+13

-6

lines changed

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2012-2014 Sonatype, Inc. All rights reserved.`
	`2`	`+ * Copyright (c) 2012-2015 Sonatype, Inc. All rights reserved.`
`3`	`3`	`*`
`4`	`4`	`* This program is licensed to you under the Apache License Version 2.0,`
`5`	`5`	`* and you may not use this file except in compliance with the Apache License Version 2.0.`
`@@ -38,6 +38,7 @@`
`38`	`38`	`importstaticjava.lang.Boolean.TRUE;`
`39`	`39`	`importstaticjava.util.concurrent.TimeUnit.MILLISECONDS;`
`40`	`40`	`importstaticorg.glassfish.grizzly.ssl.SSLUtils.getSSLEngine;`
	`41`	`+importorg.glassfish.grizzly.utils.Exceptions;`
`41`	`42`	`importstaticorg.glassfish.grizzly.utils.Exceptions.*;`
`42`	`43`
`43`	`44`	`/**`
`@@ -215,6 +216,10 @@ private void flushOnSSLHandshakeComplete() throws IOException {`
`215`	`216`	`publicvoidonStart(Connectionconnection) {`
`216`	`217`	`}`
`217`	`218`
	`219`	`+publicvoidonFailure(Connectionconnection,Throwablet) {`
	`220`	`+connection.closeWithReason(Exceptions.makeIOException(t));`
	`221`	`+ }`
	`222`	`+`
`218`	`223`	`publicvoidonComplete(Connectionconnection) {`
`219`	`224`	`if (c.equals(connection)) {`
`220`	`225`	`filter.removeHandshakeListener(this);`
`@@ -225,10 +230,6 @@ public void onComplete(Connection connection) {`
`225`	`230`	`}`
`226`	`231`	`}`
`227`	`232`	`}`
`228`		`-`
`229`		`-publicvoidonFailure(Connectionconnection,Throwablet) {`
`230`		`-`
`231`		`- }`
`232`	`233`	`});`
`233`	`234`	`filter.handshake(context.getConnection(),null);`
`234`	`235`	`}`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2012-2014 Sonatype, Inc. All rights reserved.`
	`2`	`+ * Copyright (c) 2012-2015 Sonatype, Inc. All rights reserved.`
`3`	`3`	`*`
`4`	`4`	`* This program is licensed to you under the Apache License Version 2.0,`
`5`	`5`	`* and you may not use this file except in compliance with the Apache License Version 2.0.`
`@@ -658,6 +658,12 @@ public void onClosed(Closeable closeable, CloseType type) throws IOException {`
`658`	`658`	`newGracefulCloseEvent(HttpTransactionContext.this),null);`
`659`	`659`	`}elseif (CloseType.REMOTELY.equals(type)) {`
`660`	`660`	`abort(REMOTELY_CLOSED_EXCEPTION);`
	`661`	`+ }else {`
	`662`	`+try {`
	`663`	`+closeable.assertOpen();`
	`664`	`+ }catch (IOExceptionioe) {`
	`665`	`+abort(ioe);`
	`666`	`+ }`
`661`	`667`	`}`
`662`	`668`	`}`
`663`	`669`	`};`

Comments

(0)