cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp DataSender.java ReplicationTransmitter.java

2005-07-26 Thread yoavs
yoavs   2005/07/26 17:36:26

  Modified:catalina/src/share/org/apache/catalina/ant/jmx
JMXAccessorCondition.java
JMXAccessorEqualsCondition.java
JMXAccessorTask.java
   modules/cluster/src/share/org/apache/catalina/cluster/tcp
DataSender.java ReplicationTransmitter.java
  Log:
  Minor JavaDoc fixes.
  
  Revision  ChangesPath
  1.4   +18 -2 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
  
  Index: JMXAccessorCondition.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorCondition.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JMXAccessorCondition.java 1 Jul 2005 18:54:13 -   1.3
  +++ JMXAccessorCondition.java 27 Jul 2005 00:36:26 -  1.4
  @@ -1,3 +1,19 @@
  +/*
  + * Copyright 2002,2004-2005 The Apache Software Foundation.
  + * 
  + * Licensed under the Apache License, Version 2.0 (the License);
  + * you may not use this file except in compliance with the License.
  + * You may obtain a copy of the License at
  + * 
  + *  http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed under the License is distributed on an AS IS BASIS,
  + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
  + */
  +
   package org.apache.catalina.ant.jmx;
   
   import java.io.IOException;
  @@ -287,7 +303,7 @@
   
   /**
* Get value from MBeans attribute 
  - * @return
  + * @return The value
*/
   protected String accessJMXValue() {
   try {
  
  
  
  1.4   +18 -2 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
  
  Index: JMXAccessorEqualsCondition.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JMXAccessorEqualsCondition.java   30 Jun 2005 13:15:13 -  1.3
  +++ JMXAccessorEqualsCondition.java   27 Jul 2005 00:36:26 -  1.4
  @@ -1,3 +1,19 @@
  +/*
  + * Copyright 2002,2004-2005 The Apache Software Foundation.
  + * 
  + * Licensed under the Apache License, Version 2.0 (the License);
  + * you may not use this file except in compliance with the License.
  + * You may obtain a copy of the License at
  + * 
  + *  http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed under the License is distributed on an AS IS BASIS,
  + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
  + */
  +
   package org.apache.catalina.ant.jmx;
   
   import java.io.IOException;
  @@ -201,7 +217,7 @@
   }
   
   /**
  - * @return
  + * @return The value
*/
   protected String accessJMXValue() {
   try {
  
  
  
  1.11  +3 -3  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorTask.java
  
  Index: JMXAccessorTask.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorTask.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JMXAccessorTask.java  22 Jul 2005 11:39:08 -  1.10
  +++ JMXAccessorTask.java  27 Jul 2005 00:36:26 -  1.11
  @@ -1,5 +1,5 @@
   /*
  - * Copyright 2002,2004 The Apache Software Foundation.
  + * Copyright 2002,2004-2005 The Apache Software Foundation.
* 
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
  @@ -421,7 +421,7 @@
   /**
* Get Current Connection from emref/em parameter or create a new 
one!
* 
  - * @return
  + * @return The server connection
* @throws MalformedURLException
* @throws IOException
*/
  
  
  
  1.16  +4 -5  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
  
  Index: DataSender.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java,v
  retrieving revision 

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp DataSender.java ReplicationTransmitter.java

2005-04-14 Thread fhanik
fhanik  2005/04/14 14:26:28

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/tcp
DataSender.java ReplicationTransmitter.java
  Log:
  Refactor method name to make sense
  
  Revision  ChangesPath
  1.9   +4 -4  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
  
  Index: DataSender.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DataSender.java   14 Apr 2005 21:12:31 -  1.8
  +++ DataSender.java   14 Apr 2005 21:26:28 -  1.9
  @@ -508,7 +508,7 @@
* @return true, is socket close
* @see DataSender#closeSocket()
*/
  -public synchronized boolean checkIfCloseSocket() {
  +public synchronized boolean checkKeepAlive() {
   boolean isCloseSocket = true ;
   if(isConnected()) {
   if ((keepAliveTimeout  -1 
  @@ -697,7 +697,7 @@
   time = System.currentTimeMillis();
   }
   synchronized(this) {
  -checkIfCloseSocket();
  +checkKeepAlive();
   if (!isConnected())
   openSocket();
   }
  @@ -716,7 +716,7 @@
   writeData(data);
   } finally {
   this.keepAliveCount++;
  -checkIfCloseSocket();
  +checkKeepAlive();
   if(doProcessingStats) {
   addProcessingStats(time);
   }
  
  
  
  1.28  +2 -2  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
  
  Index: ReplicationTransmitter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- ReplicationTransmitter.java   14 Apr 2005 21:12:31 -  1.27
  +++ ReplicationTransmitter.java   14 Apr 2005 21:26:28 -  1.28
  @@ -550,7 +550,7 @@
   IDataSender sender = (IDataSender) ((java.util.Map.Entry) 
iter
   .next()).getValue();
   if (sender != null  sender instanceof DataSender)
  -((DataSender) sender).checkIfCloseSocket();
  +((DataSender) sender).checkKeepAlive();
   }
   }
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]