Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
6735b769
Commit
6735b769
authored
Sep 23, 2017
by
Guus der Kinderen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OF-159: Defensively clean up, even in case of exceptions.
parent
b4d73f9e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
16 deletions
+20
-16
S2STestService.java
src/java/org/jivesoftware/util/S2STestService.java
+20
-16
No files found.
src/java/org/jivesoftware/util/S2STestService.java
View file @
6735b769
package
org
.
jivesoftware
.
util
;
package
org
.
jivesoftware
.
util
;
import
java.security.cert.Certificate
;
import
java.security.cert.Certificate
;
import
java.security.cert.CertificateParsingException
;
import
java.security.cert.X509Certificate
;
import
java.security.cert.X509Certificate
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.HashMap
;
...
@@ -85,26 +84,31 @@ public class S2STestService {
...
@@ -85,26 +84,31 @@ public class S2STestService {
InterceptorManager
.
getInstance
().
addInterceptor
(
interceptor
);
InterceptorManager
.
getInstance
().
addInterceptor
(
interceptor
);
// Send ping.
// Send ping.
Log
.
info
(
"Sending server to server ping request to "
+
domain
);
try
{
Log
.
info
(
"Sending server to server ping request to "
+
domain
);
sendPing
();
sendPing
();
// Wait for success or exceed socket 5s timeout.
// Wait for success or exceed socket 5s timeout.
waitUntil
.
tryAcquire
(
6
,
TimeUnit
.
SECONDS
);
waitUntil
.
tryAcquire
(
6
,
TimeUnit
.
SECONDS
);
// Check on the connection status.
// Check on the connection status.
logSessionStatus
();
logSessionStatus
();
// Prepare response.
// Prepare response.
results
.
put
(
"certs"
,
getCertificates
());
results
.
put
(
"certs"
,
getCertificates
()
);
results
.
put
(
"stanzas"
,
interceptor
.
toString
());
results
.
put
(
"stanzas"
,
interceptor
.
toString
()
);
results
.
put
(
"logs"
,
logs
.
toString
());
results
.
put
(
"logs"
,
logs
.
toString
()
);
// Cleanup
InterceptorManager
.
getInstance
().
removeInterceptor
(
interceptor
);
Logger
.
getRootLogger
().
removeAppender
(
appender
);
return
results
;
return
results
;
}
}
finally
{
// Cleanup
InterceptorManager
.
getInstance
().
removeInterceptor
(
interceptor
);
Logger
.
getRootLogger
().
removeAppender
(
appender
);
}
}
/**
/**
* Begins intercepting logging.
* Begins intercepting logging.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment