You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2009/11/05 01:59:05 UTC
svn commit: r832945 [3/4] - in /tomcat/trunk/java/org/apache/catalina: ./
ant/ ant/jmx/ authenticator/ connector/ core/ deploy/ filters/ ha/
ha/authenticator/ ha/context/ ha/deploy/ ha/session/ ha/tcp/ loader/
manager/ manager/host/ mbeans/ realm/ serv...
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Thu Nov 5 00:58:58 2009
@@ -258,6 +258,7 @@
/**
* Initialize this servlet.
*/
+ @Override
public void init()
throws ServletException {
@@ -308,6 +309,7 @@
/**
* Handles the special WebDAV methods.
*/
+ @Override
protected void service(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
@@ -351,6 +353,7 @@
* and false if any of the conditions is not satisfied, in which case
* request processing is stopped
*/
+ @Override
protected boolean checkIfHeaders(HttpServletRequest request,
HttpServletResponse response,
ResourceAttributes resourceAttributes)
@@ -373,6 +376,7 @@
*
* @param request The servlet request we are processing
*/
+ @Override
protected String getRelativePath(HttpServletRequest request) {
// Are we being processed by a RequestDispatcher.include()?
if (request.getAttribute(Globals.INCLUDE_REQUEST_URI_ATTR) != null) {
@@ -401,6 +405,7 @@
* @throws ServletException If an error occurs
* @throws IOException If an IO error occurs
*/
+ @Override
protected void doOptions(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
@@ -776,6 +781,7 @@
/**
* DELETE Method.
*/
+ @Override
protected void doDelete(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
@@ -803,6 +809,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet-specified error occurs
*/
+ @Override
protected void doPut(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
@@ -2699,6 +2706,7 @@
/**
* Get a String representation of this lock token.
*/
+ @Override
public String toString() {
String result = "Type:" + type + "\n";
Modified: tomcat/trunk/java/org/apache/catalina/session/FileStore.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/FileStore.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/FileStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/FileStore.java Thu Nov 5 00:58:58 2009
@@ -127,6 +127,7 @@
* the corresponding version number, in the format
* <code><description>/<version></code>.
*/
+ @Override
public String getInfo() {
return (info);
@@ -143,6 +144,7 @@
/**
* Return the name for this Store, used for logging.
*/
+ @Override
public String getStoreName() {
return(storeName);
}
Modified: tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java Thu Nov 5 00:58:58 2009
@@ -174,6 +174,7 @@
/**
* Return the info for this Store.
*/
+ @Override
public String getInfo() {
return (info);
}
@@ -210,6 +211,7 @@
/**
* Return the name for this Store, used for logging.
*/
+ @Override
public String getStoreName() {
return (storeName);
}
@@ -959,6 +961,7 @@
/**
* Called once when this Store is first started.
*/
+ @Override
public void start() throws LifecycleException {
super.start();
@@ -971,6 +974,7 @@
* Called once when this Store is stopping.
*
*/
+ @Override
public void stop() throws LifecycleException {
super.stop();
Modified: tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java Thu Nov 5 00:58:58 2009
@@ -59,6 +59,7 @@
* the corresponding version number, in the format
* <code><description>/<version></code>.
*/
+ @Override
public String getInfo() {
return (info);
@@ -68,6 +69,7 @@
/**
* Return the descriptive short name of this Manager implementation.
*/
+ @Override
public String getName() {
return (name);
Modified: tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java Thu Nov 5 00:58:58 2009
@@ -324,6 +324,7 @@
* @param container
* The associated Container
*/
+ @Override
public void setContainer(Container container) {
// De-register from the old Container (if any)
@@ -348,6 +349,7 @@
* the corresponding version number, in the format
* <code><description>/<version></code>.
*/
+ @Override
public String getInfo() {
return (info);
@@ -417,6 +419,7 @@
/**
* Return the descriptive short name of this Manager implementation.
*/
+ @Override
public String getName() {
return (name);
@@ -537,7 +540,8 @@
/**
* Implements the Manager interface, direct call to processExpires and processPersistenceChecks
*/
- public void processExpires() {
+ @Override
+ public void processExpires() {
long timeNow = System.currentTimeMillis();
Session sessions[] = findSessions();
@@ -589,6 +593,7 @@
* @exception IOException if an input/output error occurs while
* processing this request
*/
+ @Override
public Session findSession(String id) throws IOException {
Session session = super.findSession(id);
@@ -689,6 +694,7 @@
*
* @param session Session to be removed
*/
+ @Override
public void remove(Session session) {
super.remove (session);
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Thu Nov 5 00:58:58 2009
@@ -160,6 +160,7 @@
*
* @param container The associated Container
*/
+ @Override
public void setContainer(Container container) {
// De-register from the old Container (if any)
@@ -184,6 +185,7 @@
* the corresponding version number, in the format
* <code><description>/<version></code>.
*/
+ @Override
public String getInfo() {
return (info);
@@ -236,6 +238,7 @@
/**
* Return the descriptive short name of this Manager implementation.
*/
+ @Override
public String getName() {
return (name);
@@ -280,6 +283,7 @@
* @exception IllegalStateException if a new session cannot be
* instantiated for any reason
*/
+ @Override
public Session createSession(String sessionId) {
if ((maxActiveSessions >= 0) &&
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=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Thu Nov 5 00:58:58 2009
@@ -941,6 +941,7 @@
/**
* Return a string representation of this object.
*/
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
Modified: tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java Thu Nov 5 00:58:58 2009
@@ -57,6 +57,7 @@
*
* @param b The parameter to write
*/
+ @Override
public void write(int b) {
buf.write(b);
}
Modified: tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java Thu Nov 5 00:58:58 2009
@@ -233,11 +233,13 @@
/**
* Returns true if the string is not empty.
*/
+ @Override
public boolean evaluate() {
return !(getValue().length() == 0);
}
+ @Override
public String toString() {
return value.toString();
}
@@ -278,11 +280,13 @@
}
}
private final class NotNode extends OppNode {
+ @Override
public boolean evaluate() {
return !left.evaluate();
}
+ @Override
public int getPrecedence() {
return PRECEDENCE_NOT;
}
@@ -291,16 +295,19 @@
/**
* Overridden to pop only one value.
*/
+ @Override
public void popValues(List<Node> values) {
left = values.remove(0);
}
+ @Override
public String toString() {
return left + " NOT";
}
}
private final class AndNode extends OppNode {
+ @Override
public boolean evaluate() {
if (!left.evaluate()) // Short circuit
return false;
@@ -308,16 +315,19 @@
}
+ @Override
public int getPrecedence() {
return PRECEDENCE_LOGICAL;
}
+ @Override
public String toString() {
return left + " " + right + " AND";
}
}
private final class OrNode extends OppNode {
+ @Override
public boolean evaluate() {
if (left.evaluate()) // Short circuit
return true;
@@ -325,11 +335,13 @@
}
+ @Override
public int getPrecedence() {
return PRECEDENCE_LOGICAL;
}
+ @Override
public String toString() {
return left + " " + right + " OR";
}
@@ -342,46 +354,55 @@
}
}
private final class EqualNode extends CompareNode {
+ @Override
public boolean evaluate() {
return (compareBranches() == 0);
}
+ @Override
public int getPrecedence() {
return PRECEDENCE_COMPARE;
}
+ @Override
public String toString() {
return left + " " + right + " EQ";
}
}
private final class GreaterThanNode extends CompareNode {
+ @Override
public boolean evaluate() {
return (compareBranches() > 0);
}
+ @Override
public int getPrecedence() {
return PRECEDENCE_COMPARE;
}
+ @Override
public String toString() {
return left + " " + right + " GT";
}
}
private final class LessThanNode extends CompareNode {
+ @Override
public boolean evaluate() {
return (compareBranches() < 0);
}
+ @Override
public int getPrecedence() {
return PRECEDENCE_COMPARE;
}
+ @Override
public String toString() {
return left + " " + right + " LT";
}
Modified: tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java Thu Nov 5 00:58:58 2009
@@ -108,6 +108,7 @@
* @exception java.io.IOException
* if the outputstream already been called
*/
+ @Override
public PrintWriter getWriter() throws java.io.IOException {
if (servletOutputStream == null) {
if (printWriter == null) {
@@ -130,6 +131,7 @@
* @exception java.io.IOException
* if the printwriter already been called
*/
+ @Override
public ServletOutputStream getOutputStream() throws java.io.IOException {
if (printWriter == null) {
if (servletOutputStream == null) {
@@ -175,6 +177,7 @@
* @return the content type of the resource referenced by this
* <code>ResponseIncludeWrapper</code>, or <code>null</code> if not known.
*/
+ @Override
public String getContentType() {
if (contentType == null) {
String url = request.getRequestURI();
@@ -197,6 +200,7 @@
*
* @param mime a mime type
*/
+ @Override
public void setContentType(String mime) {
contentType = mime;
if (contentType != null) {
@@ -205,6 +209,7 @@
}
+ @Override
public void addDateHeader(String name, long value) {
super.addDateHeader(name, value);
String lname = name.toLowerCase();
@@ -213,6 +218,7 @@
}
}
+ @Override
public void addHeader(String name, String value) {
super.addHeader(name, value);
String lname = name.toLowerCase();
@@ -229,6 +235,7 @@
}
}
+ @Override
public void setDateHeader(String name, long value) {
super.setDateHeader(name, value);
String lname = name.toLowerCase();
@@ -237,6 +244,7 @@
}
}
+ @Override
public void setHeader(String name, String value) {
super.setHeader(name, value);
String lname = name.toLowerCase();
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java Thu Nov 5 00:58:58 2009
@@ -63,6 +63,7 @@
* @exception ServletException
* if an error occurs
*/
+ @Override
public void init() throws ServletException {
if (getServletConfig().getInitParameter("debug") != null)
@@ -99,6 +100,7 @@
* @exception ServletException
* if an error occurs
*/
+ @Override
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
if (debug > 0) log("SSIServlet.doGet()");
@@ -119,6 +121,7 @@
* @exception ServletException
* if an error occurs
*/
+ @Override
public void doPost(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
if (debug > 0) log("SSIServlet.doPost()");
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Thu Nov 5 00:58:58 2009
@@ -155,6 +155,7 @@
*
* @param server The new server
*/
+ @Override
public void setServer(Server server) {
this.server = server;
@@ -569,6 +570,7 @@
}
+ @Override
public void destroy() {
}
@@ -576,6 +578,7 @@
/**
* Start a new server instance.
*/
+ @Override
public void start() {
if (server == null) {
@@ -621,6 +624,7 @@
/**
* Stop an existing server instance.
*/
+ @Override
public void stop() {
try {
@@ -678,6 +682,7 @@
*/
protected class CatalinaShutdownHook extends Thread {
+ @Override
public void run() {
if (server != null) {
@@ -713,6 +718,7 @@
ClassLoader parentClassLoader = null;
+ @Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
Modified: tomcat/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java Thu Nov 5 00:58:58 2009
@@ -140,6 +140,7 @@
* @param digester Digester instance to which the new Rule instances
* should be added.
*/
+ @Override
public void addRuleInstances(Digester digester) {
//Cluster configuration start
digester.addObjectCreate(prefix + "Membership",
Modified: tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java Thu Nov 5 00:58:58 2009
@@ -51,6 +51,7 @@
* the element name otherwise
* @param attributes The attribute list for this element
*/
+ @Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
Service svc = (Service)digester.peek();
@@ -83,6 +84,7 @@
* @param name the local name if the parser is namespace aware, or just
* the element name otherwise
*/
+ @Override
public void end(String namespace, String name) throws Exception {
digester.pop();
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java Thu Nov 5 00:58:58 2009
@@ -108,6 +108,7 @@
* @param digester Digester instance to which the new Rule instances
* should be added.
*/
+ @Override
public void addRuleInstances(Digester digester) {
if (create) {
Modified: tomcat/trunk/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java Thu Nov 5 00:58:58 2009
@@ -58,6 +58,7 @@
*
* @exception Exception if a processing error occurs
*/
+ @Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
Modified: tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Embedded.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Embedded.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Embedded.java Thu Nov 5 00:58:58 2009
@@ -309,6 +309,7 @@
*
* @exception IllegalStateException if no engines have been added yet
*/
+ @Override
public synchronized void addConnector(Connector connector) {
if( log.isDebugEnabled() ) {
@@ -576,6 +577,7 @@
* the corresponding version number, in the format
* <code><description>/<version></code>.
*/
+ @Override
public String getInfo() {
return (info);
@@ -762,6 +764,7 @@
*
* @param listener The listener to add
*/
+ @Override
public void addLifecycleListener(LifecycleListener listener) {
lifecycle.addLifecycleListener(listener);
@@ -773,6 +776,7 @@
* Get the lifecycle listeners associated with this lifecycle. If this
* Lifecycle has no listeners registered, a zero-length array is returned.
*/
+ @Override
public LifecycleListener[] findLifecycleListeners() {
return lifecycle.findLifecycleListeners();
@@ -785,6 +789,7 @@
*
* @param listener The listener to remove
*/
+ @Override
public void removeLifecycleListener(LifecycleListener listener) {
lifecycle.removeLifecycleListener(listener);
@@ -800,6 +805,7 @@
* @exception LifecycleException if this component detects a fatal error
* that prevents this component from being used
*/
+ @Override
public void start() throws LifecycleException {
if( log.isInfoEnabled() )
@@ -842,6 +848,7 @@
* @exception LifecycleException if this component detects a fatal error
* that needs to be reported
*/
+ @Override
public void stop() throws LifecycleException {
if( log.isDebugEnabled() )
Modified: tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Thu Nov 5 00:58:58 2009
@@ -87,6 +87,7 @@
* @param digester Digester instance to which the new Rule instances
* should be added.
*/
+ @Override
public void addRuleInstances(Digester digester) {
digester.addObjectCreate(prefix + "Engine",
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java Thu Nov 5 00:58:58 2009
@@ -87,6 +87,7 @@
* @param digester Digester instance to which the new Rule instances
* should be added.
*/
+ @Override
public void addRuleInstances(Digester digester) {
digester.addObjectCreate(prefix + "Host",
Modified: tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java Thu Nov 5 00:58:58 2009
@@ -79,6 +79,7 @@
*
* @exception Exception if a processing error occurs
*/
+ @Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
Modified: tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java Thu Nov 5 00:58:58 2009
@@ -86,6 +86,7 @@
* @param digester Digester instance to which the new Rule instances
* should be added.
*/
+ @Override
public void addRuleInstances(Digester digester) {
digester.addObjectCreate(prefix + "Ejb",
Modified: tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java Thu Nov 5 00:58:58 2009
@@ -85,6 +85,7 @@
* @param digester Digester instance to which the new Rule instances
* should be added.
*/
+ @Override
public void addRuleInstances(Digester digester) {
digester.addObjectCreate(prefix + "Realm",
Modified: tomcat/trunk/java/org/apache/catalina/startup/SetAllPropertiesRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/SetAllPropertiesRule.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/SetAllPropertiesRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/SetAllPropertiesRule.java Thu Nov 5 00:58:58 2009
@@ -53,6 +53,7 @@
*
* @exception Exception if a processing error occurs
*/
+ @Override
public void begin(String namespace, String nameX, Attributes attributes)
throws Exception {
Modified: tomcat/trunk/java/org/apache/catalina/startup/SetContextPropertiesRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/SetContextPropertiesRule.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/SetContextPropertiesRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/SetContextPropertiesRule.java Thu Nov 5 00:58:58 2009
@@ -48,6 +48,7 @@
*
* @exception Exception if a processing error occurs
*/
+ @Override
public void begin(String namespace, String nameX, Attributes attributes)
throws Exception {
Modified: tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java Thu Nov 5 00:58:58 2009
@@ -87,6 +87,7 @@
* @param name the local name if the parser is namespace aware, or just
* the element name otherwise
*/
+ @Override
public void end(String namespace, String name) throws Exception {
// Identify the objects to be used
@@ -110,6 +111,7 @@
/**
* Render a printable version of this Rule.
*/
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder("SetNextRule[");
Modified: tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java Thu Nov 5 00:58:58 2009
@@ -86,6 +86,7 @@
* @param digester Digester instance to which the new Rule instances
* should be added.
*/
+ @Override
public void addRuleInstances(Digester digester) {
// Note the sharing of state between rules
@@ -113,6 +114,7 @@
this.taglibUriRule = taglibUriRule;
}
+ @Override
public void body(String namespace, String name, String text)
throws Exception {
taglibUriRule.setDuplicateUri(false);
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Nov 5 00:58:58 2009
@@ -697,6 +697,7 @@
public ExistingStandardWrapper( Servlet existing ) {
this.existing = existing;
}
+ @Override
public synchronized Servlet loadServlet() throws ServletException {
if (!init) {
existing.init(facade);
@@ -705,9 +706,11 @@
return existing;
}
+ @Override
public long getAvailable() {
return 0;
}
+ @Override
public boolean isUnavailable() {
return false;
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Thu Nov 5 00:58:58 2009
@@ -150,6 +150,7 @@
* @param digester Digester instance to which the new Rule instances
* should be added.
*/
+ @Override
public void addRuleInstances(Digester digester) {
sessionConfig = new SetSessionConfig();
jspConfig = new SetJspConfig();
@@ -619,6 +620,7 @@
public SetLoginConfig() {
}
+ @Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
if (isLoginConfigSet){
@@ -640,6 +642,7 @@
public SetJspConfig() {
}
+ @Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
if (isJspConfigSet){
@@ -661,6 +664,7 @@
public SetSessionConfig() {
}
+ @Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
if (isSessionConfigSet){
@@ -683,6 +687,7 @@
public SetAuthConstraintRule() {
}
+ @Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
SecurityConstraint securityConstraint =
@@ -707,6 +712,7 @@
public SetDistributableRule() {
}
+ @Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
WebXml webXml = (WebXml) digester.peek();
@@ -733,6 +739,7 @@
private String method = null;
+ @Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
@@ -771,6 +778,7 @@
public ServletDefCreateRule() {
}
+ @Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
ServletDef servletDef = new ServletDef();
@@ -779,6 +787,7 @@
digester.getLogger().debug("new " + servletDef.getClass().getName());
}
+ @Override
public void end(String namespace, String name)
throws Exception {
ServletDef servletDef = (ServletDef) digester.pop();
@@ -799,6 +808,7 @@
super(paramIndex);
}
+ @Override
public void end(String namespace, String name) {
if (bodyTextStack != null && !bodyTextStack.empty()) {
// what we do now is push one parameter onto the top set of parameters
@@ -837,6 +847,7 @@
* @param name the local name if the parser is namespace aware, or just
* the element name otherwise
*/
+ @Override
public void end(String namespace, String name) throws Exception {
// Retrieve or construct the parameter values array
@@ -924,6 +935,7 @@
public IgnoreAnnotationsRule() {
}
+ @Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
WebXml webxml = (WebXml) digester.peek(digester.getCount() - 1);
@@ -948,6 +960,7 @@
public AbsoluteOrderingRule() {
}
+ @Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
digester.getLogger().warn(
@@ -963,6 +976,7 @@
public RelativeOrderingRule() {
}
+ @Override
public void begin(String namespace, String name, Attributes attributes)
throws Exception {
digester.getLogger().warn(
@@ -989,6 +1003,7 @@
* the element name otherwise
* @param bodyText The body text of this element
*/
+ @Override
public void body(String namespace, String name, String text)
throws Exception {
String namespaceuri = null;
@@ -1023,6 +1038,7 @@
* the element name otherwise
* @param bodyText The body text of this element
*/
+ @Override
public void body(String namespace, String name, String text)
throws Exception {
String namespaceuri = null;
Modified: tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java Thu Nov 5 00:58:58 2009
@@ -80,6 +80,7 @@
* @return String
* @see java.lang.Exception#getMessage()
*/
+ @Override
public String getMessage() {
StringBuilder buf = new StringBuilder(super.getMessage());
if (faultyMembers==null || faultyMembers.size() == 0 ) {
@@ -161,14 +162,17 @@
return cause;
}
+ @Override
public String toString() {
return "FaultyMember:"+member.toString();
}
+ @Override
public int hashCode() {
return (member!=null)?member.hashCode():0;
}
+ @Override
public boolean equals(Object o) {
if (member==null || (!(o instanceof FaultyMember)) || (((FaultyMember)o).member==null)) return false;
return member.equals(((FaultyMember)o).member);
Modified: tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java Thu Nov 5 00:58:58 2009
@@ -42,11 +42,13 @@
System.arraycopy(id,offset,this.id,0,length);
}
+ @Override
public int hashCode() {
if ( id == null ) return 0;
return Arrays.hashCode(id);
}
+ @Override
public boolean equals(Object other) {
boolean result = (other instanceof UniqueId);
if ( result ) {
@@ -63,6 +65,7 @@
return id;
}
+ @Override
public String toString() {
StringBuilder buf = new StringBuilder("UniqueId");
buf.append(org.apache.catalina.tribes.util.Arrays.toString(id));
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java Thu Nov 5 00:58:58 2009
@@ -48,7 +48,9 @@
//override optionflag
protected int optionFlag = Channel.SEND_OPTIONS_BYTE_MESSAGE|Channel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_SYNCHRONIZED_ACK;
+ @Override
public int getOptionFlag() {return optionFlag;}
+ @Override
public void setOptionFlag(int flag) {optionFlag=flag;}
private int startLevel = 0;
@@ -73,6 +75,7 @@
* @param options int - sender options, see class documentation
* @return ClusterMessage[] - the replies from the members, if any.
*/
+ @Override
public void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload payload) throws ChannelException {
if ( destination == null ) destination = membershipService.getMembers();
if ((msg.getOptions()&Channel.SEND_OPTIONS_MULTICAST) == Channel.SEND_OPTIONS_MULTICAST) {
@@ -97,6 +100,7 @@
* SND_RX_SEQ - starts the replication receiver<BR>
* @throws ChannelException if a startup error occurs or the service is already started.
*/
+ @Override
public void start(int svc) throws ChannelException {
this.internalStart(svc);
}
@@ -112,6 +116,7 @@
* SND_RX_SEQ - stops the replication receiver<BR>
* @throws ChannelException if a startup error occurs or the service is already started.
*/
+ @Override
public void stop(int svc) throws ChannelException {
this.internalStop(svc);
}
@@ -234,16 +239,19 @@
}
+ @Override
public void memberAdded(Member member){
SenderState.getSenderState(member);
super.memberAdded(member);
}
+ @Override
public void memberDisappeared(Member member){
SenderState.removeSenderState(member);
super.memberDisappeared(member);
}
+ @Override
public void messageReceived(ChannelMessage msg) {
if ( Logs.MESSAGES.isTraceEnabled() ) {
Logs.MESSAGES.trace("ChannelCoordinator - Received msg:" + new UniqueId(msg.getUniqueId()) + " at " +new java.sql.Timestamp(System.currentTimeMillis())+ " from "+msg.getAddress().getName());
@@ -282,6 +290,7 @@
this.membershipService.setMembershipListener(this);
}
+ @Override
public void heartbeat() {
if ( clusterSender!=null ) clusterSender.heartbeat();
super.heartbeat();
@@ -290,6 +299,7 @@
/**
* has members
*/
+ @Override
public boolean hasMembers() {
return this.getMembershipService().hasMembers();
}
@@ -298,6 +308,7 @@
* Get all current cluster members
* @return all members or empty array
*/
+ @Override
public Member[] getMembers() {
return this.getMembershipService().getMembers();
}
@@ -307,6 +318,7 @@
* @param mbr Member
* @return Member
*/
+ @Override
public Member getMember(Member mbr){
return this.getMembershipService().getMember(mbr);
}
@@ -317,6 +329,7 @@
*
* @return Member
*/
+ @Override
public Member getLocalMember(boolean incAlive) {
return this.getMembershipService().getLocalMember(incAlive);
}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Thu Nov 5 00:58:58 2009
@@ -145,6 +145,7 @@
* Invoke this method from the application on a periodic basis if
* you have turned off internal heartbeats <code>channel.setHeartbeat(false)</code>
*/
+ @Override
public void heartbeat() {
super.heartbeat();
Iterator<Object> i = membershipListeners.iterator();
@@ -237,6 +238,7 @@
* but its an extreme case, and you're probably better off doing that logic between the applications itself.
* @param msg ChannelMessage
*/
+ @Override
public void messageReceived(ChannelMessage msg) {
if ( msg == null ) return;
try {
@@ -313,6 +315,7 @@
* and the channel will broadcast it to the membership listeners
* @param member Member - the new member
*/
+ @Override
public void memberAdded(Member member) {
//notify upwards
for (int i=0; i<membershipListeners.size(); i++ ) {
@@ -326,6 +329,7 @@
* and the channel will broadcast it to the membership listeners
* @param member Member - the member that left or crashed
*/
+ @Override
public void memberDisappeared(Member member) {
//notify upwards
for (int i=0; i<membershipListeners.size(); i++ ) {
@@ -401,6 +405,7 @@
* @throws ChannelException
* @see org.apache.catalina.tribes.Channel#start(int)
*/
+ @Override
public synchronized void start(int svc) throws ChannelException {
setupDefaultStack();
if (optionCheck) checkOptionFlags();
@@ -417,6 +422,7 @@
* @throws ChannelException
* @see org.apache.catalina.tribes.Channel#stop(int)
*/
+ @Override
public synchronized void stop(int svc) throws ChannelException {
if (hbthread != null) {
hbthread.stopHeartbeat();
@@ -654,6 +660,7 @@
interrupt();
}
+ @Override
public void run() {
while (doRun) {
try {
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java Thu Nov 5 00:58:58 2009
@@ -136,6 +136,7 @@
channel.removeChannelListener(this);
}
+ @Override
public void finalize() {
breakdown();
}
@@ -215,10 +216,12 @@
}
}
+ @Override
public int hashCode() {
return key.hashCode();
}
+ @Override
public boolean equals(Object o) {
if ( o instanceof RpcCollector ) {
RpcCollector r = (RpcCollector)o;
@@ -237,10 +240,12 @@
this.id = id;
}
+ @Override
public int hashCode() {
return id[0]+id[1]+id[2]+id[3];
}
+ @Override
public boolean equals(Object o) {
if ( o instanceof RpcCollectorKey ) {
RpcCollectorKey r = (RpcCollectorKey)o;
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/RpcMessage.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/RpcMessage.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/RpcMessage.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/RpcMessage.java Thu Nov 5 00:58:58 2009
@@ -71,6 +71,7 @@
out.writeObject(message);
}
+ @Override
public String toString() {
StringBuilder buf = new StringBuilder("RpcMessage[");
buf.append(super.toString());
@@ -93,6 +94,7 @@
reply = true;
}
+ @Override
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
reply = true;
int length = in.readInt();
@@ -103,6 +105,7 @@
in.read(rpcId, 0, length);
}
+ @Override
public void writeExternal(ObjectOutput out) throws IOException {
out.writeInt(uuid.length);
out.write(uuid, 0, uuid.length);
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java Thu Nov 5 00:58:58 2009
@@ -37,12 +37,14 @@
protected byte[] domain = new byte[0];
+ @Override
public void messageReceived(ChannelMessage msg) {
//should we filter incoming based on domain?
super.messageReceived(msg);
}//messageReceived
+ @Override
public void memberAdded(Member member) {
if ( membership == null ) setupMembership();
boolean notify = false;
@@ -53,6 +55,7 @@
if ( notify ) super.memberAdded(member);
}
+ @Override
public void memberDisappeared(Member member) {
if ( membership == null ) setupMembership();
boolean notify = false;
@@ -63,21 +66,25 @@
if ( notify ) super.memberDisappeared(member);
}
+ @Override
public boolean hasMembers() {
if ( membership == null ) setupMembership();
return membership.hasMembers();
}
+ @Override
public Member[] getMembers() {
if ( membership == null ) setupMembership();
return membership.getMembers();
}
+ @Override
public Member getMember(Member mbr) {
if ( membership == null ) setupMembership();
return membership.getMember(mbr);
}
+ @Override
public Member getLocalMember(boolean incAlive) {
return super.getLocalMember(incAlive);
}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java Thu Nov 5 00:58:58 2009
@@ -49,6 +49,7 @@
protected boolean deepclone = true;
+ @Override
public void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload payload) throws ChannelException {
int size = msg.getMessage().getLength();
boolean frag = (size>maxSize) && okToProcess(msg.getOptions());
@@ -60,6 +61,7 @@
}
}
+ @Override
public void messageReceived(ChannelMessage msg) {
boolean isFrag = XByteBuffer.toBoolean(msg.getMessage().getBytesDirect(),msg.getMessage().getLength()-1);
msg.getMessage().trim(1);
@@ -133,6 +135,7 @@
}
}
+ @Override
public void heartbeat() {
try {
Set<FragKey> set = fragpieces.keySet();
@@ -222,10 +225,12 @@
public FragKey(byte[] id ) {
this.uniqueId = id;
}
+ @Override
public int hashCode() {
return XByteBuffer.toInt(uniqueId,0);
}
+ @Override
public boolean equals(Object o ) {
if ( o instanceof FragKey ) {
return Arrays.equals(uniqueId,((FragKey)o).uniqueId);
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java Thu Nov 5 00:58:58 2009
@@ -40,6 +40,7 @@
public class GzipInterceptor extends ChannelInterceptorBase {
public static final int DEFAULT_BUFFER_SIZE = 2048;
+ @Override
public void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload payload) throws ChannelException {
try {
byte[] data = compress(msg.getMessage().getBytes());
@@ -52,6 +53,7 @@
}
}
+ @Override
public void messageReceived(ChannelMessage msg) {
try {
byte[] data = decompress(msg.getMessage().getBytes());
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java Thu Nov 5 00:58:58 2009
@@ -44,19 +44,23 @@
protected long keepAliveTime = 5000;
protected LinkedBlockingQueue<Runnable> runnablequeue = new LinkedBlockingQueue<Runnable>();
+ @Override
public long getCurrentSize() {
return currentSize.get();
}
+ @Override
public long addAndGetCurrentSize(long inc) {
return currentSize.addAndGet(inc);
}
+ @Override
public long setAndGetCurrentSize(long value) {
currentSize.set(value);
return value;
}
+ @Override
public boolean addToQueue(ChannelMessage msg, Member[] destination, InterceptorPayload payload) {
final LinkObject obj = new LinkObject(msg,destination,payload);
Runnable r = new Runnable() {
@@ -68,16 +72,19 @@
return true;
}
+ @Override
public LinkObject removeFromQueue() {
return null; //not used, thread pool contains its own queue.
}
+ @Override
public void startQueue() {
if ( run ) return;
executor = new ThreadPoolExecutor(maxSpareThreads,maxThreads,keepAliveTime,TimeUnit.MILLISECONDS,runnablequeue);
run = true;
}
+ @Override
public void stopQueue() {
run = false;
executor.shutdownNow();
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java Thu Nov 5 00:58:58 2009
@@ -52,6 +52,7 @@
setOptionFlag(Channel.SEND_OPTIONS_ASYNCHRONOUS);
}
+ @Override
public void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload payload) throws ChannelException {
boolean async = (msg.getOptions() & Channel.SEND_OPTIONS_ASYNCHRONOUS) == Channel.SEND_OPTIONS_ASYNCHRONOUS;
if ( async && run ) {
@@ -100,6 +101,7 @@
}
+ @Override
public void setOptionFlag(int flag) {
if ( flag != Channel.SEND_OPTIONS_ASYNCHRONOUS ) log.warn("Warning, you are overriding the asynchronous option flag, this will disable the Channel.SEND_OPTIONS_ASYNCHRONOUS that other apps might use.");
super.setOptionFlag(flag);
@@ -135,6 +137,7 @@
return value;
}
+ @Override
public void start(int svc) throws ChannelException {
//start the thread
if (!run ) {
@@ -148,6 +151,7 @@
}
+ @Override
public void stop(int svc) throws ChannelException {
//stop the thread
if ( run ) {
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java Thu Nov 5 00:58:58 2009
@@ -448,6 +448,7 @@
//============================================================================================================
// OVERRIDDEN METHODS FROM CHANNEL INTERCEPTOR BASE
//============================================================================================================
+ @Override
public void start(int svc) throws ChannelException {
if (membership == null) setupMembership();
if (started)return;
@@ -459,6 +460,7 @@
startElection(false);
}
+ @Override
public void stop(int svc) throws ChannelException {
try {
halt();
@@ -480,11 +482,13 @@
}
+ @Override
public void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload payload) throws ChannelException {
waitForRelease();
super.sendMessage(destination, msg, payload);
}
+ @Override
public void messageReceived(ChannelMessage msg) {
if ( Arrays.contains(msg.getMessage().getBytesDirect(),0,COORD_ALIVE,0,COORD_ALIVE.length) ) {
//ignore message, its an alive message
@@ -504,10 +508,12 @@
}
}
+ @Override
public boolean accept(ChannelMessage msg) {
return super.accept(msg);
}
+ @Override
public void memberAdded(Member member) {
memberAdded(member,true);
}
@@ -527,6 +533,7 @@
}
+ @Override
public void memberDisappeared(Member member) {
try {
@@ -554,6 +561,7 @@
return coord != null && getLocalMember(false).equals(coord);
}
+ @Override
public void heartbeat() {
try {
MemberImpl local = (MemberImpl)getLocalMember(false);
@@ -574,6 +582,7 @@
/**
* has members
*/
+ @Override
public boolean hasMembers() {
return membership.hasMembers();
@@ -583,6 +592,7 @@
* Get all current cluster members
* @return all members or empty array
*/
+ @Override
public Member[] getMembers() {
return membership.getMembers();
@@ -593,6 +603,7 @@
* @param mbr Member
* @return Member
*/
+ @Override
public Member getMember(Member mbr) {
return membership.getMember(mbr);
@@ -603,6 +614,7 @@
*
* @return Member
*/
+ @Override
public Member getLocalMember(boolean incAlive) {
Member local = super.getLocalMember(incAlive);
if ( view == null && (local != null)) setupMembership();
@@ -751,6 +763,7 @@
}
}
+ @Override
public void fireInterceptorEvent(InterceptorEvent event) {
if (event instanceof CoordinationEvent &&
((CoordinationEvent)event).type == CoordinationEvent.EVT_CONF_RX)
@@ -816,6 +829,7 @@
return interceptor;
}
+ @Override
public String toString() {
StringBuilder buf = new StringBuilder("CoordinationEvent[type=");
buf.append(type).append("\n\tLocal:");
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java Thu Nov 5 00:58:58 2009
@@ -64,6 +64,7 @@
ReentrantReadWriteLock inLock = new ReentrantReadWriteLock(true);
ReentrantReadWriteLock outLock= new ReentrantReadWriteLock(true);
+ @Override
public void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload payload) throws ChannelException {
if ( !okToProcess(msg.getOptions()) ) {
super.sendMessage(destination, msg, payload);
@@ -94,6 +95,7 @@
if ( cx != null ) throw cx;
}
+ @Override
public void messageReceived(ChannelMessage msg) {
if ( !okToProcess(msg.getOptions()) ) {
super.messageReceived(msg);
@@ -168,11 +170,13 @@
return result;
}
+ @Override
public void memberAdded(Member member) {
//notify upwards
super.memberAdded(member);
}
+ @Override
public void memberDisappeared(Member member) {
//reset counters - lock free
incounter.remove(member);
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java Thu Nov 5 00:58:58 2009
@@ -51,6 +51,7 @@
/**
* has members
*/
+ @Override
public boolean hasMembers() {
return super.hasMembers() || (members.size()>0);
}
@@ -59,6 +60,7 @@
* Get all current cluster members
* @return all members or empty array
*/
+ @Override
public Member[] getMembers() {
if ( members.size() == 0 ) return super.getMembers();
else {
@@ -78,6 +80,7 @@
* @param mbr Member
* @return Member
*/
+ @Override
public Member getMember(Member mbr) {
if ( members.contains(mbr) ) return members.get(members.indexOf(mbr));
else return super.getMember(mbr);
@@ -88,6 +91,7 @@
*
* @return Member
*/
+ @Override
public Member getLocalMember(boolean incAlive) {
if (this.localMember != null ) return localMember;
else return super.getLocalMember(incAlive);
@@ -98,12 +102,14 @@
* @param svc int
* @throws ChannelException
*/
+ @Override
public void start(int svc) throws ChannelException {
if ( (Channel.SND_RX_SEQ&svc)==Channel.SND_RX_SEQ ) super.start(Channel.SND_RX_SEQ);
if ( (Channel.SND_TX_SEQ&svc)==Channel.SND_TX_SEQ ) super.start(Channel.SND_TX_SEQ);
final Member[] mbrs = members.toArray(new Member[members.size()]);
final ChannelInterceptorBase base = this;
Thread t = new Thread() {
+ @Override
public void run() {
for (int i=0; i<mbrs.length; i++ ) {
base.memberAdded(mbrs[i]);
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java Thu Nov 5 00:58:58 2009
@@ -82,6 +82,7 @@
protected HashMap<Member, Long> addSuspects = new HashMap<Member, Long>();
+ @Override
public void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload payload) throws ChannelException {
try {
super.sendMessage(destination, msg, payload);
@@ -97,6 +98,7 @@
}
}
+ @Override
public void messageReceived(ChannelMessage msg) {
//catch incoming
boolean process = true;
@@ -112,6 +114,7 @@
}//messageReceived
+ @Override
public void memberAdded(Member member) {
if ( membership == null ) setupMembership();
boolean notify = false;
@@ -133,6 +136,7 @@
if ( notify ) super.memberAdded(member);
}
+ @Override
public void memberDisappeared(Member member) {
if ( membership == null ) setupMembership();
boolean notify = false;
@@ -164,25 +168,30 @@
}
}
+ @Override
public boolean hasMembers() {
if ( membership == null ) setupMembership();
return membership.hasMembers();
}
+ @Override
public Member[] getMembers() {
if ( membership == null ) setupMembership();
return membership.getMembers();
}
+ @Override
public Member getMember(Member mbr) {
if ( membership == null ) setupMembership();
return membership.getMember(mbr);
}
+ @Override
public Member getLocalMember(boolean incAlive) {
return super.getLocalMember(incAlive);
}
+ @Override
public void heartbeat() {
super.heartbeat();
checkMembers(false);
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java Thu Nov 5 00:58:58 2009
@@ -59,6 +59,7 @@
WeakReference<TcpFailureDetector> failureDetector = null;
WeakReference<StaticMembershipInterceptor> staticMembers = null;
+ @Override
public synchronized void start(int svc) throws ChannelException {
super.start(svc);
running = true;
@@ -81,6 +82,7 @@
}
+ @Override
public void stop(int svc) throws ChannelException {
running = false;
if ( thread != null ) thread.interrupt();
@@ -88,6 +90,7 @@
super.stop(svc);
}
+ @Override
public void heartbeat() {
super.heartbeat();
if (!getUseThread()) sendPing();
@@ -144,6 +147,7 @@
}
}
+ @Override
public void messageReceived(ChannelMessage msg) {
//catch incoming
boolean process = true;
@@ -159,6 +163,7 @@
}//messageReceived
protected class PingThread extends Thread {
+ @Override
public void run() {
while (running) {
try {
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java Thu Nov 5 00:58:58 2009
@@ -54,6 +54,7 @@
DecimalFormat df = new DecimalFormat("#0.00");
+ @Override
public void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload payload) throws ChannelException {
if ( access.addAndGet(1) == 1 ) txStart = System.currentTimeMillis();
long bytes = XByteBuffer.getDataPackageLength(((ChannelData)msg).getDataPackageLength());
@@ -77,6 +78,7 @@
msgTxCnt.addAndGet(1);
}
+ @Override
public void messageReceived(ChannelMessage msg) {
if ( rxStart == 0 ) rxStart = System.currentTimeMillis();
long bytes = XByteBuffer.getDataPackageLength(((ChannelData)msg).getDataPackageLength());
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java Thu Nov 5 00:58:58 2009
@@ -48,6 +48,7 @@
protected long expire = 1000 * 60; //one minute expiration
protected boolean deepclone = true;
+ @Override
public void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload payload) throws
ChannelException {
//todo, optimize, if destination.length==1, then we can do
@@ -73,6 +74,7 @@
}
}
+ @Override
public void messageReceived(ChannelMessage msg) {
if (okToProcess(msg.getOptions())) {
if ( msg.getMessage().getLength() == (START_DATA.length+msg.getUniqueId().length+END_DATA.length) &&
@@ -110,6 +112,7 @@
this.expire = expire;
}
+ @Override
public void heartbeat() {
try {
long now = System.currentTimeMillis();
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java Thu Nov 5 00:58:58 2009
@@ -271,6 +271,7 @@
return data;
}
+ @Override
public int hashCode() {
return XByteBuffer.toInt(getUniqueId(),0);
}
@@ -280,6 +281,7 @@
* @param o Object
* @return boolean
*/
+ @Override
public boolean equals(Object o) {
if ( o instanceof ChannelData ) {
return Arrays.equals(getUniqueId(),((ChannelData)o).getUniqueId());
@@ -290,6 +292,7 @@
* Create a shallow clone, only the data gets recreated
* @return ClusterData
*/
+ @Override
public Object clone() {
// byte[] d = this.getDataPackage();
// return ClusterData.getDataFromPackage(d);
@@ -338,6 +341,7 @@
( (Channel.SEND_OPTIONS_SYNCHRONIZED_ACK & options) != Channel.SEND_OPTIONS_SYNCHRONIZED_ACK);
}
+ @Override
public String toString() {
StringBuilder buf = new StringBuilder();
buf.append("ClusterData[src=");
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java Thu Nov 5 00:58:58 2009
@@ -43,6 +43,7 @@
* been closed.
* @todo Implement this java.io.OutputStream method
*/
+ @Override
public void write(int b) throws IOException {
buffer.append((byte)b);
}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java Thu Nov 5 00:58:58 2009
@@ -69,6 +69,7 @@
* @exception ClassNotFoundException if this class cannot be found
* @exception IOException if an input/output error occurs
*/
+ @Override
public Class<?> resolveClass(ObjectStreamClass classDesc)
throws ClassNotFoundException, IOException {
String name = classDesc.getName();
@@ -155,6 +156,7 @@
else throw new ClassNotFoundException(name);
}
+ @Override
public void close() throws IOException {
this.classLoaders = null;
super.close();
Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java Thu Nov 5 00:58:58 2009
@@ -518,6 +518,7 @@
super();
setName("Tribes-MembershipReceiver");
}
+ @Override
public void run() {
while ( doRunReceiver ) {
try {
@@ -554,6 +555,7 @@
setName("Tribes-MembershipSender");
}
+ @Override
public void run() {
while ( doRunSender ) {
try {
@@ -609,6 +611,7 @@
return false;
}
}
+ @Override
public void run() {
boolean success = false;
int attempt = 0;
Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Thu Nov 5 00:58:58 2009
@@ -507,6 +507,7 @@
/**
* String representation of this object
*/
+ @Override
public String toString() {
StringBuilder buf = new StringBuilder("org.apache.catalina.tribes.membership.MemberImpl[");
buf.append(getName()).append(",");
@@ -543,6 +544,7 @@
* @see java.lang.Object#hashCode()
* @return The hash code
*/
+ @Override
public int hashCode() {
return getHost()[0]+getHost()[1]+getHost()[2]+getHost()[3];
}
@@ -551,6 +553,7 @@
* Returns true if the param o is a McastMember with the same name
* @param o
*/
+ @Override
public boolean equals(Object o) {
if ( o instanceof MemberImpl ) {
return Arrays.equals(this.getHost(),((MemberImpl)o).getHost()) &&
Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java Thu Nov 5 00:58:58 2009
@@ -64,6 +64,7 @@
*/
protected Comparator<Member> memberComparator = new MemberComparator();
+ @Override
public Object clone() {
synchronized (membersLock) {
Membership clone = new Membership(local, memberComparator);
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Thu Nov 5 00:58:58 2009
@@ -311,6 +311,7 @@
finalize();
}
+ @Override
public void finalize() {
try {broadcast(MapMessage.MSG_STOP,false); }catch ( Exception ignore){}
//cleanup
@@ -329,10 +330,12 @@
this.externalLoaders = null;
}
+ @Override
public int hashCode() {
return Arrays.hashCode(this.mapContextName);
}
+ @Override
public boolean equals(Object o) {
if ( o == null ) return false;
if ( !(o instanceof AbstractReplicatedMap)) return false;
@@ -807,6 +810,7 @@
* @param key Object
* @return Object
*/
+ @Override
public Object remove(Object key) {
return remove(key,true);
}
@@ -828,6 +832,7 @@
return (MapEntry)super.get(key);
}
+ @Override
public Object get(Object key) {
MapEntry entry = (MapEntry)super.get(key);
if (log.isTraceEnabled()) log.trace("Requesting id:"+key+" entry:"+entry);
@@ -917,10 +922,12 @@
* @param key Object
* @return boolean
*/
+ @Override
public boolean containsKey(Object key) {
return super.containsKey(key);
}
+ @Override
public Object put(Object key, Object value) {
return put(key,value,true);
}
@@ -952,6 +959,7 @@
* Copies all values from one map to this instance
* @param m Map
*/
+ @Override
public void putAll(Map m) {
Iterator i = m.entrySet().iterator();
while ( i.hasNext() ) {
@@ -960,6 +968,7 @@
}
}
+ @Override
public void clear() {
clear(true);
}
@@ -975,6 +984,7 @@
}
}
+ @Override
public boolean containsValue(Object value) {
if ( value == null ) {
return super.containsValue(value);
@@ -989,6 +999,7 @@
}//end if
}
+ @Override
public Object clone() {
throw new UnsupportedOperationException("This operation is not valid on a replicated map");
}
@@ -1011,6 +1022,7 @@
return super.size();
}
+ @Override
public Set<MapEntry> entrySet() {
LinkedHashSet<MapEntry> set = new LinkedHashSet<MapEntry>(super.size());
Iterator i = super.entrySet().iterator();
@@ -1025,6 +1037,7 @@
return Collections.unmodifiableSet(set);
}
+ @Override
public Set<Object> keySet() {
//todo implement
//should only return keys where this is active.
@@ -1041,6 +1054,7 @@
}
+ @Override
public int size() {
//todo, implement a counter variable instead
//only count active members in this node
@@ -1056,10 +1070,12 @@
return counter;
}
+ @Override
public boolean isEmpty() {
return size()==0;
}
+ @Override
public Collection<Object> values() {
ArrayList<Object> values = new ArrayList<Object>();
Iterator i = super.entrySet().iterator();
@@ -1162,10 +1178,12 @@
return old;
}
+ @Override
public int hashCode() {
return key.hashCode();
}
+ @Override
public boolean equals(Object o) {
return key.equals(o);
}
@@ -1196,6 +1214,7 @@
}
}
+ @Override
public String toString() {
StringBuilder buf = new StringBuilder("MapEntry[key:");
buf.append(getKey()).append("; ");
@@ -1235,6 +1254,7 @@
private Member[] nodes;
private Member primary;
+ @Override
public String toString() {
StringBuilder buf = new StringBuilder("MapMessage[context=");
buf.append(new String(mapId));
@@ -1401,6 +1421,7 @@
* shallow clone
* @return Object
*/
+ @Override
public Object clone() {
MapMessage msg = new MapMessage(this.mapId, this.msgtype, this.diff, this.key, this.value, this.diffvalue, this.primary, this.nodes);
msg.keydata = this.keydata;
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java Thu Nov 5 00:58:58 2009
@@ -113,6 +113,7 @@
//------------------------------------------------------------------------------
// METHODS TO OVERRIDE
//------------------------------------------------------------------------------
+ @Override
protected int getStateMessageType() {
return AbstractReplicatedMap.MapMessage.MSG_STATE;
}
@@ -124,6 +125,7 @@
* @return Member - the backup node
* @throws ChannelException
*/
+ @Override
protected Member[] publishEntryInfo(Object key, Object value) throws ChannelException {
if (! (key instanceof Serializable && value instanceof Serializable) ) return new Member[0];
Member[] members = getMapMembers();
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Thu Nov 5 00:58:58 2009
@@ -92,6 +92,7 @@
//------------------------------------------------------------------------------
// METHODS TO OVERRIDE
//------------------------------------------------------------------------------
+ @Override
protected int getStateMessageType() {
return AbstractReplicatedMap.MapMessage.MSG_STATE_COPY;
}
@@ -103,6 +104,7 @@
* @return Member - the backup node
* @throws ChannelException
*/
+ @Override
protected Member[] publishEntryInfo(Object key, Object value) throws ChannelException {
if (! (key instanceof Serializable && value instanceof Serializable) ) return new Member[0];
//select a backup node
Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java Thu Nov 5 00:58:58 2009
@@ -49,12 +49,14 @@
queue.returnSender(sender);
}
+ @Override
public synchronized void connect() throws IOException {
//do nothing, happens in the socket sender itself
queue.open();
setConnected(true);
}
+ @Override
public synchronized void disconnect() {
queue.close();
setConnected(false);
@@ -79,6 +81,7 @@
return poolSize;
}
+ @Override
public boolean keepalive() {
//do nothing, the pool checks on every return
return (queue==null)?false:queue.checkIdleKeepAlive();
Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java Thu Nov 5 00:58:58 2009
@@ -155,6 +155,7 @@
}
}
+ @Override
public void close() {
setDoRun(false);
try {socket.close();}catch ( Exception ignore){}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java Thu Nov 5 00:58:58 2009
@@ -91,6 +91,7 @@
* Connect other cluster member receiver
* @see org.apache.catalina.tribes.transport.IDataSender#connect()
*/
+ @Override
public void connect() throws IOException {
openSocket();
}
@@ -101,6 +102,7 @@
*
* @see IDataSender#disconnect()
*/
+ @Override
public void disconnect() {
boolean connect = isConnected();
closeSocket();
@@ -149,6 +151,7 @@
/**
* Name of this SockerSender
*/
+ @Override
public String toString() {
StringBuilder buf = new StringBuilder("DataSender[(");
buf.append(super.toString()).append(")");
Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java Thu Nov 5 00:58:58 2009
@@ -85,6 +85,7 @@
else return result;
}
+ @Override
public void connect() throws IOException {
//do nothing, we connect on demand
setConnected(true);
@@ -119,16 +120,19 @@
}
+ @Override
public synchronized void disconnect() {
try {close(); }catch (Exception x){}
setConnected(false);
}
+ @Override
public void finalize() {
try {disconnect(); }catch ( Exception ignore){}
}
+ @Override
public boolean keepalive() {
//throw new UnsupportedOperationException("Method ParallelBioSender.checkKeepAlive() not implemented");
boolean result = false;
Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java Thu Nov 5 00:58:58 2009
@@ -64,6 +64,7 @@
* @todo Implement this org.apache.catalina.tribes.transport.PooledSender
* method
*/
+ @Override
public DataSender getNewDataSender() {
MultipointBioSender sender = new MultipointBioSender();
AbstractSender.transferProperties(this,sender);
Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=832945&r1=832944&r2=832945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java Thu Nov 5 00:58:58 2009
@@ -81,6 +81,7 @@
// return interestOpsMutex;
// }
+ @Override
public void stop() {
this.stopListening();
super.stop();
@@ -91,6 +92,7 @@
* @throws Exception
* @see org.apache.catalina.tribes.ClusterReceiver#start()
*/
+ @Override
public void start() throws IOException {
super.start();
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org