Author: markt
Date: Sat Dec 12 22:47:12 2015
New Revision: 1719749
URL: http://svn.apache.org/viewvc?rev=1719749&view=rev
Log:
Refactor to make code clearer and fix IDE warnings
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1719749&r1=1719748&r2=1719749&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Sat Dec 12 22:47:12 2015
@@ -991,23 +991,25 @@ public class DeltaManager extends Cluste
return null;
}
DeltaRequest deltaRequest = session.getDeltaRequest();
- session.lock();
- if (deltaRequest.getSize() > 0) {
- counterSend_EVT_SESSION_DELTA++;
- byte[] data = serializeDeltaRequest(session,deltaRequest);
- msg = new SessionMessageImpl(getName(),
- SessionMessage.EVT_SESSION_DELTA,
- data,
- sessionId,
- sessionId + "-" +
System.currentTimeMillis());
- session.resetDeltaRequest();
+ try {
+ session.lock();
+ if (deltaRequest.getSize() > 0) {
+ counterSend_EVT_SESSION_DELTA++;
+ byte[] data = serializeDeltaRequest(session,deltaRequest);
+ msg = new SessionMessageImpl(getName(),
+
SessionMessage.EVT_SESSION_DELTA,
+ data,
+ sessionId,
+ sessionId + "-" +
System.currentTimeMillis());
+ session.resetDeltaRequest();
+ }
+ } finally {
+ session.unlock();
}
} catch (IOException x) {
log.error(sm.getString("deltaManager.createMessage.unableCreateDeltaRequest",
sessionId), x);
return null;
- } finally {
- if (session!=null) session.unlock();
}
if(msg == null) {
if(!expires && !session.isPrimarySession()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
