Author: markt
Date: Fri Jul 13 22:14:51 2012
New Revision: 1361420
URL: http://svn.apache.org/viewvc?rev=1361420&view=rev
Log:
FindBugs. Rename some methods to avoid confusion.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1361420&r1=1361419&r2=1361420&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Fri Jul
13 22:14:51 2012
@@ -529,10 +529,10 @@ public class DeltaSession extends Standa
*/
@Override
public void readObjectData(ObjectInputStream stream) throws
ClassNotFoundException, IOException {
- readObject((ObjectInput)stream);
+ doReadObject((ObjectInput)stream);
}
public void readObjectData(ObjectInput stream) throws
ClassNotFoundException, IOException {
- readObject(stream);
+ doReadObject(stream);
}
/**
@@ -551,7 +551,7 @@ public class DeltaSession extends Standa
writeObjectData((ObjectOutput)stream);
}
public void writeObjectData(ObjectOutput stream) throws IOException {
- writeObject(stream);
+ doWriteObject(stream);
}
public void resetDeltaRequest() {
@@ -703,11 +703,11 @@ public class DeltaSession extends Standa
* if an input/output error occurs
*/
@Override
- protected void readObject(ObjectInputStream stream) throws
ClassNotFoundException, IOException {
- readObject((ObjectInput)stream);
+ protected void doReadObject(ObjectInputStream stream) throws
ClassNotFoundException, IOException {
+ doReadObject((ObjectInput)stream);
}
- private void readObject(ObjectInput stream) throws ClassNotFoundException,
IOException {
+ private void doReadObject(ObjectInput stream) throws
ClassNotFoundException, IOException {
// Deserialize the scalar instance variables (except Manager)
authType = null; // Transient only
@@ -757,7 +757,7 @@ public class DeltaSession extends Standa
public void writeExternal(ObjectOutput out ) throws java.io.IOException {
try {
lock();
- writeObject(out);
+ doWriteObject(out);
}finally {
unlock();
}
@@ -786,11 +786,11 @@ public class DeltaSession extends Standa
* if an input/output error occurs
*/
@Override
- protected void writeObject(ObjectOutputStream stream) throws IOException {
- writeObject((ObjectOutput)stream);
+ protected void doWriteObject(ObjectOutputStream stream) throws IOException
{
+ doWriteObject((ObjectOutput)stream);
}
- private void writeObject(ObjectOutput stream) throws IOException {
+ private void doWriteObject(ObjectOutput stream) throws IOException {
// Write the scalar instance variables (except Manager)
stream.writeObject(Long.valueOf(creationTime));
stream.writeObject(Long.valueOf(lastAccessedTime));
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1361420&r1=1361419&r2=1361420&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Fri Jul
13 22:14:51 2012
@@ -1039,7 +1039,7 @@ public class StandardSession implements
public void readObjectData(ObjectInputStream stream)
throws ClassNotFoundException, IOException {
- readObject(stream);
+ doReadObject(stream);
}
@@ -1056,7 +1056,7 @@ public class StandardSession implements
public void writeObjectData(ObjectOutputStream stream)
throws IOException {
- writeObject(stream);
+ doWriteObject(stream);
}
@@ -1548,7 +1548,7 @@ public class StandardSession implements
* @exception ClassNotFoundException if an unknown class is specified
* @exception IOException if an input/output error occurs
*/
- protected void readObject(ObjectInputStream stream)
+ protected void doReadObject(ObjectInputStream stream)
throws ClassNotFoundException, IOException {
// Deserialize the scalar instance variables (except Manager)
@@ -1613,7 +1613,7 @@ public class StandardSession implements
*
* @exception IOException if an input/output error occurs
*/
- protected void writeObject(ObjectOutputStream stream) throws IOException {
+ protected void doWriteObject(ObjectOutputStream stream) throws IOException
{
// Write the scalar instance variables (except Manager)
stream.writeObject(Long.valueOf(creationTime));
Modified: tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml?rev=1361420&r1=1361419&r2=1361420&view=diff
==============================================================================
--- tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml (original)
+++ tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml Fri Jul 13 22:14:51
2012
@@ -17,27 +17,6 @@
<FindBugsFilter>
<!-- Issues that should be fixed but can't be without API breaking changes
-->
<!-- so wait until next release-->
- <!-- Need to re-factor method names. protected do[Read|Write]Object? -->
- <Match>
- <Class name="org.apache.catalina.ha.session.DeltaSession" />
- <Method name="readObject" />
- <Bug code="Se" />
- </Match>
- <Match>
- <Class name="org.apache.catalina.ha.session.DeltaSession" />
- <Method name="writeObject" />
- <Bug code="Se" />
- </Match>
- <Match>
- <Class name="org.apache.catalina.session.StandardSession" />
- <Method name="readObject" />
- <Bug code="Se" />
- </Match>
- <Match>
- <Class name="org.apache.catalina.session.StandardSession" />
- <Method name="writeObject" />
- <Bug code="Se" />
- </Match>
<!-- Re-factor to only have the thread running when an instance of the
-->
<!-- handler is active -->
<Match>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
