svn commit: r1697985 - in /tomcat/jk/trunk: native/common/jk_global.h native/configure.ac xdocs/miscellaneous/changelog.xml

2015-08-26 Thread rjung
Author: rjung
Date: Wed Aug 26 18:10:46 2015
New Revision: 1697985

URL: http://svn.apache.org/r1697985
Log:
BZ 58285: Don't use GCC atomics on platforms, for
which GCC doesn't provide an atomics implementation.

This is a regression in version 1.2.41.

Modified:
tomcat/jk/trunk/native/common/jk_global.h
tomcat/jk/trunk/native/configure.ac
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/common/jk_global.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1697985r1=1697984r2=1697985view=diff
==
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Wed Aug 26 18:10:46 2015
@@ -433,7 +433,7 @@ typedef int jk_sock_t;
 do {\
 if (InterlockedDecrement(x)  0) InterlockedIncrement(x);\
 } while (0)
-#elif defined(__GNUC__)  (__GNUC__  4 || (__GNUC__ == 4  __GNUC_MINOR__ 
= 1))
+#elif defined(HAVE_ATOMIC_BUILTINS)
 #define JK_ATOMIC_INCREMENT(x) __sync_add_and_fetch(x, 1)
 #define JK_ATOMIC_DECREMENT(x) \
 do {\

Modified: tomcat/jk/trunk/native/configure.ac
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.ac?rev=1697985r1=1697984r2=1697985view=diff
==
--- tomcat/jk/trunk/native/configure.ac (original)
+++ tomcat/jk/trunk/native/configure.ac Wed Aug 26 18:10:46 2015
@@ -439,6 +439,29 @@ JK_CHECK_SASTORAGE
 AC_CHECK_FUNC(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO,1,[Have getaddrinfo()]))
 AC_CHECK_FUNC(gethostbyname_r, AC_DEFINE(HAVE_GETHOSTBYNAME_R,1,[Have 
gethostbyname_r()]))
 
+AC_DEFUN([JK_CHECK_ATOMICS], [
+AC_MSG_CHECKING(whether the compiler provides atomic builtins)
+AC_TRY_RUN([
+int main()
+{
+unsigned long val = 1010;
+
+if (__sync_add_and_fetch(val, 1010) != 2020 || val != 2020)
+return 1;
+
+if (__sync_sub_and_fetch(val, 1010) != 1010 || val != 1010)
+return 1;
+
+return 0;
+}
+]
+, [ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_ATOMIC_BUILTINS, 1, [Define to 1 if 
the compiler provides atomic builtins]) ]
+, [ AC_MSG_RESULT([no]) ]
+)
+])dnl
+
+JK_CHECK_ATOMICS
+
 dnl Apache-2.0 needs the os subdirectory to include os.h
 dnl this include is copy from os/config.m4
 sinclude(../support/os_apache.m4)

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1697985r1=1697984r2=1697985view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Aug 26 18:10:46 2015
@@ -41,6 +41,15 @@
   /p
 /section
 section name=Changes between 1.2.41 and 1.2.42
+  br /
+  subsection name=Native
+changelog
+  fix
+bug58285/bug: Don't use GCC atomics on platforms, for which
+GCC doesn't provide an atomics implementation. (rjung)
+  /fix
+/changelog
+  /subsection
 /section
 section name=Changes between 1.2.40 and 1.2.41
   br /



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 58285] Atomics missing - undefined symbol __sync_sub_and_fetch_4

2015-08-26 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58285

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

   Hardware|PC  |All

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1697988 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

2015-08-26 Thread rjung
Author: rjung
Date: Wed Aug 26 18:29:20 2015
New Revision: 1697988

URL: http://svn.apache.org/r1697988
Log:
Add some more info to new changelog entry.

Modified:
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1697988r1=1697987r2=1697988view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Aug 26 18:29:20 2015
@@ -46,7 +46,9 @@
 changelog
   fix
 bug58285/bug: Don't use GCC atomics on platforms, for which
-GCC doesn't provide an atomics implementation. (rjung)
+GCC doesn't provide an atomics implementation. This regression
+was introduced by the fix to bug44454/bug and bug56703/bug.
+(rjung)
   /fix
 /changelog
   /subsection



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 58285] Atomics missing - undefined symbol __sync_sub_and_fetch_4

2015-08-26 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58285

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED
 OS||All

--- Comment #1 from Rainer Jung rainer.j...@kippdata.de ---
Fixed by adding a configure test in r1697985.
Will be part of version 1.2.42.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 58286] New: Crash in jk-status on Windows (when producing HTML output)

2015-08-26 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58286

Bug ID: 58286
   Summary: Crash in jk-status on Windows (when producing HTML
output)
   Product: Tomcat Connectors
   Version: 1.2.41
  Hardware: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Common
  Assignee: dev@tomcat.apache.org
  Reporter: rainer.j...@kippdata.de

The fix for BZ 54177 introduced a new problem on the Windows platform. The use
of strftime() with the format pattern %z works well on Unix/Linux, but %z on
Windows has a totally different meaning. It doesn't return a numeric timezone
info, but instead the full time zone name. This results in the same non-well
formed XML problem as in BZ 54177, but furthermore when formatting the time
stamp in jk-status for HTML output it results in a crash. This should happen
for mod_jk and for the ISAPI redirector. Apart from Windows there might also be
a problem on Netware (untested).

The problem should not happen, when calling jk-status with the query string
?mime=txt, ?mime=prop or ?mime=xml. Only the default (equivalent to ?mime=html)
is affected.

Since the time zone info is not critical, the simplest short term mitigation is
removing %z from the strftime format string before building:

Index: native/common/jk_status.c
===
--- native/common/jk_status.c   (revision 1697988)
+++ native/common/jk_status.c   (working copy)
@@ -241,9 +241,9 @@
 #define JK_STATUS_WAIT_AFTER_UPDATE3
 #define JK_STATUS_REFRESH_DEF  10
 #define JK_STATUS_ESC_CHARS(?\)
-#define JK_STATUS_TIME_FMT_HTML%Y-%m-%d %H:%M:%S %z
+#define JK_STATUS_TIME_FMT_HTML%Y-%m-%d %H:%M:%S
 #define JK_STATUS_TIME_FMT_TEXT%Y%m%d%H%M%S
-#define JK_STATUS_TIME_FMT_TZ  %z
+#define JK_STATUS_TIME_FMT_TZ  
 #define JK_STATUS_TIME_BUF_SZ  (30)

 #define JK_STATUS_HEAD ?xml version=\1.0\
encoding=\ISO-8859-1\?\n \

Any broken binary should be fixable as a workaound by editing and overwriting
the two occurences of %z in the binary file with spaces. Do not remove the %z,
just replace by two spaces in both places where it occurs. make sure to not
change any other bytes in the binary.

The fix for the next version will be to use specific timezone formatting for
Windows. Probably it will be based on _get_timezone(). Netware will need to be
checked.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 58285] New: Atomics missing - undefined symbol __sync_sub_and_fetch_4

2015-08-26 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58285

Bug ID: 58285
   Summary: Atomics missing - undefined symbol
__sync_sub_and_fetch_4
   Product: Tomcat Connectors
   Version: 1.2.41
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Common
  Assignee: dev@tomcat.apache.org
  Reporter: rainer.j...@kippdata.de

Connectors 1.2.41 introduced the use of atomics. When using GCC 4.1 or newer,
support for atomics is assumed, but actually on some platforms not available.
For platforms where gcc does not support atomics, it compiles in a function
call to e.g. __sync_add_and_fetch_4() and trying to load mod_jk.so results in
an undefined symbol error for __sync_add_and_fetch_4.

This should not happen on the Windows platform, where we use another atomics
implementation. It should also not happen for AMD 64 processors, because GCC
4.1 and later implement atomics for them.

It does happen in x86 32 Bit processors at least for old GCC and also on
Solaris Sparc for GCC 4.1.2 (not for 4.2.4 and later).

This will be fixed by using a configure auto-detection for atomics support. If
support is not detected, and we are not on WIN32, we fall back to APR provided
atomics. If APR is not available, we fall back to non-atomic
increment/decrement plus a startup warning.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 58285] Atomics missing - undefined symbol __sync_sub_and_fetch_4

2015-08-26 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58285

--- Comment #2 from Rainer Jung rainer.j...@kippdata.de ---
For the sake of completeness: this regression was introduced by the fix to
BZ 44454 and BZ 56703.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 58287] New: Questionable use of Global objects on Windows

2015-08-26 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58287

Bug ID: 58287
   Summary: Questionable use of Global objects on Windows
   Product: Tomcat Connectors
   Version: 1.2.41
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Common
  Assignee: dev@tomcat.apache.org
  Reporter: rainer.j...@kippdata.de

In common/jk_shm.c and in iis/jk_isapi_plugin.c we create objects in the
Windows Global name space. Those are used as names for mutexes and for shared
memory. Creating global objects needs the privilege SeCreateGlobalPrivilege. It
did not work for me when using a Windows binary of mod_jk inside httpd not
running as a service. I has to add run as administator to the binary although
the user already was in the administrator group.

I question the use of the global namespace. I can't see, why local should not
be enough plus local would make conflicts between multiple instances less
likely.

Do we see any reasons, why using Local\ insted of Global\ should not work (and
even be better)? Especially for IIS I don't know enough about the various
operating models.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 58284] New: StandardSession attempts to silently write NonSerializable objects

2015-08-26 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58284

Bug ID: 58284
   Summary: StandardSession attempts to silently write
NonSerializable objects
   Product: Tomcat 8
   Version: trunk
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: sho...@amazon.com

Customer reported an issue with non-serializable objects when using our
DynamoDB Session manager
(https://github.com/aws/aws-dynamodb-session-tomcat/issues/30). After digging
into the code it looks like StandardSession is attempting to do several things
when giving non-serializable attributes. For top level objects that don't
implement serializable it silently removes it. That code is working fine
although I am a little wary that it doesn't fail as this could hide bugs in the
users code and make it difficult for them to determine why a certain attribute
isn't being persisted to the backing store. After that StandardSession attempts
to write the remaining attributes to the ObjectOutputStream. If a serialization
exception is encountered here (i.e. some object in the object graph does not
implement Serializable) then the exception is caught and a special indicator
NOT_SERIALIZED is written to the object stream and a warning is logged. Now
internally ObjectOutputStream is handling the same exception and writing it's
own special marker, TC_EXCEPTION, and the serialized exception object to the
stream. This is written before StandardSession has a chance to write
NOT_SERIALIZED. In StandardSession.readObject there is logic to skip
deserializing any objects that have been written to the stream as
NOT_SERIALIZED. This code can never actually be executed though as
ObjectInputStream is checking if there are any occurences of TC_EXCEPTION and
will deserialize the exception object, wrap it in a WriteAbortedException and
throw it out. This causes a session with non-serializable objects in the
attributes to be written successfully but causes an exception to be thrown
when attempting to read that same session.

I understand modifying StandardSession to now throw exceptions when
non-serializable objects are encountered could be considered a breaking change
so I propose adding some kind of overload or configuration to enable this
behavior for users that want to opt in. Failing fast when non-serializable
attributes are detected seems like the right way to go as this should be fixed
in the customers code. I'm willing to submit a patch for this although I wanted
to open the issue first to make sure you concur with my assessment and coding
up a patch is worth my time.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1697842 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java webapps/docs/changelog.xml

2015-08-26 Thread kfujino
Author: kfujino
Date: Wed Aug 26 07:55:56 2015
New Revision: 1697842

URL: http://svn.apache.org/r1697842
Log:
Correct log messages in case of using ReplicatedMap.

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1697842r1=1697841r2=1697842view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 Wed Aug 26 07:55:56 2015
@@ -510,11 +510,11 @@ public abstract class AbstractReplicated
 }
 }
 } catch (ChannelException x) {
-log.error(Unable to transfer LazyReplicatedMap state., x);
+log.error(Unable to transfer AbstractReplicatedMap state., x);
 } catch (IOException x) {
-log.error(Unable to transfer LazyReplicatedMap state., x);
+log.error(Unable to transfer AbstractReplicatedMap state., x);
 } catch (ClassNotFoundException x) {
-log.error(Unable to transfer LazyReplicatedMap state., x);
+log.error(Unable to transfer AbstractReplicatedMap state., x);
 }
 }
 
@@ -906,7 +906,7 @@ public abstract class AbstractReplicated
 getChannel().send(getMapMembers(), msg, 
getChannelSendOptions());
 }
 } catch ( ChannelException x ) {
-log.error(Unable to replicate out data for a 
LazyReplicatedMap.remove operation,x);
+log.error(Unable to replicate out data for a 
AbstractReplicatedMap.remove operation,x);
 }
 return entry!=null?entry.getValue():null;
 }
@@ -970,7 +970,7 @@ public abstract class AbstractReplicated
 if ( getMapOwner()!=null ) getMapOwner().objectMadePrimay(key, 
entry.getValue());
 
 } catch (Exception x) {
-log.error(Unable to replicate out data for a 
LazyReplicatedMap.get operation, x);
+log.error(Unable to replicate out data for a 
AbstractReplicatedMap.get operation, x);
 return null;
 }
 }
@@ -1036,7 +1036,7 @@ public abstract class AbstractReplicated
 entry.setBackupNodes(backup);
 }
 } catch (ChannelException x) {
-log.error(Unable to replicate out data for a 
LazyReplicatedMap.put operation, x);
+log.error(Unable to replicate out data for a 
AbstractReplicatedMap.put operation, x);
 }
 innerMap.put(key,entry);
 return old;

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1697842r1=1697841r2=1697842view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Aug 26 07:55:56 2015
@@ -71,6 +71,10 @@
 Add support for configurations of codeChannelListener/code and
 codeMembershipListener/code in server.xml. (kfujino)
   /add
+  fix
+Correct log messages in case of using codeReplicatedMap/code.
+(kfujino)
+  /fix
 /changelog
   /subsection
   subsection name=jdbc-pool



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



buildbot failure in ASF Buildbot on tomcat-trunk

2015-08-26 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/185

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1697840
Blamelist: kfujino

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



buildbot exception in ASF Buildbot on tomcat-trunk

2015-08-26 Thread buildbot
The Buildbot has detected a build exception on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/186

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1697843
Blamelist: kfujino

BUILD FAILED: exception upload_2

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



buildbot success in ASF Buildbot on tomcat-8-trunk

2015-08-26 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-8-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-8-trunk/builds/78

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1697841
Blamelist: kfujino

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



buildbot exception in ASF Buildbot on tomcat-8-trunk

2015-08-26 Thread buildbot
The Buildbot has detected a build exception on builder tomcat-8-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-8-trunk/builds/79

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1697844
Blamelist: kfujino

BUILD FAILED: exception upload_2

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1697840 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties

2015-08-26 Thread kfujino
Author: kfujino
Date: Wed Aug 26 07:49:55 2015
New Revision: 1697840

URL: http://svn.apache.org/r1697840
Log:
Correct log messages in case of using ReplicatedMap.

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties?rev=1697840r1=1697839r2=1697840view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties 
Wed Aug 26 07:49:55 2015
@@ -21,7 +21,7 @@ abstractReplicatedMap.broadcast.noReplie
 abstractReplicatedMap.unable.diffObject=Unable to diff object. Will replicate 
the entire object instead.
 abstractReplicatedMap.unable.replicate=Unable to replicate data.
 abstractReplicatedMap.transferState.noReplies=Transfer state, 0 replies, 
probably a timeout.
-abstractReplicatedMap.unable.transferState=Unable to transfer 
LazyReplicatedMap state.
+abstractReplicatedMap.unable.transferState=Unable to transfer 
AbstractReplicatedMap state.
 abstractReplicatedMap.unable.deserialize.MapMessage=Unable to deserialize 
MapMessage.
 abstractReplicatedMap.unableApply.diff=Unable to apply diff to key:{0}
 abstractReplicatedMap.unableSelect.backup=Unable to select backup node.
@@ -29,10 +29,10 @@ abstractReplicatedMap.member.disappeared
 abstractReplicatedMap.unable.relocate=Unable to relocate[{0}] to a new backup 
node
 abstractReplicatedMap.relocate.complete=Relocation of map entries was complete 
in {0} ms.
 abstractReplicatedMap.heartbeat.failed=Unable to send 
AbstractReplicatedMap.ping message
-abstractReplicatedMap.unable.remove=Unable to replicate out data for a 
LazyReplicatedMap.remove operation
+abstractReplicatedMap.unable.remove=Unable to replicate out data for a 
AbstractReplicatedMap.remove operation
 abstractReplicatedMap.unable.retrieve=Unable to retrieve remote object for 
key:{0}
-abstractReplicatedMap.unable.get=Unable to replicate out data for a 
LazyReplicatedMap.get operation
-abstractReplicatedMap.unable.put=Unable to replicate out data for a 
LazyReplicatedMap.put operation
+abstractReplicatedMap.unable.get=Unable to replicate out data for a 
AbstractReplicatedMap.get operation
+abstractReplicatedMap.unable.put=Unable to replicate out data for a 
AbstractReplicatedMap.put operation
 abstractReplicatedMap.unsupport.operation=This operation is not valid on a 
replicated map
 mapMessage.deserialize.error.key=Deserialization error of the MapMessage.key
 mapMessage.deserialize.error.value=Deserialization error of the 
MapMessage.value



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1697844 - in /tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session: LocalStrings.properties LocalStrings_es.properties

2015-08-26 Thread kfujino
Author: kfujino
Date: Wed Aug 26 08:00:36 2015
New Revision: 1697844

URL: http://svn.apache.org/r1697844
Log:
Remove unused message.

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=1697844r1=1697843r2=1697844view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
 Wed Aug 26 08:00:36 2015
@@ -64,18 +64,12 @@ deltaSession.readSession=readObject() lo
 deltaSession.writeSession=writeObject() storing session [{0}]
 jvmRoute.cannotFindSession=Can't find session [{0}]
 jvmRoute.changeSession=Changed session from [{0}] to [{1}]
-jvmRoute.clusterListener.started=Cluster JvmRouteSessionIDBinderListener 
started
-jvmRoute.clusterListener.stopped=Cluster JvmRouteSessionIDBinderListener 
stopped
 jvmRoute.configure.warn=Please, setup your JvmRouteBinderValve at host valve, 
not at context valve!
-jvmRoute.contextNotFound=Context [{0}] not found at node [{1}]!
 jvmRoute.failover=Detected a failover with different jvmRoute - orginal route: 
[{0}] new one: [{1}] at session id [{2}]
 jvmRoute.foundManager=Found Cluster DeltaManager {0} at {1}
-jvmRoute.hostNotFound=No host found [{0}]
-jvmRoute.lostSession=Lost Session [{0}] at path [{1}]
 jvmRoute.missingJvmRouteAttribute=No engine jvmRoute attribute configured!
 jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is 
not being used. Fail over will still work, providing a PersistentManager is 
used.
 jvmRoute.notFoundManager=Not found Cluster DeltaManager at {0}
-jvmRoute.receiveMessage.sessionIDChanged=Cluster 
JvmRouteSessionIDBinderListener received orginal session ID [{0}] set to new id 
[{1}] for context path [{2}]
 jvmRoute.turnoverInfo=Turnover Check time {0} msec
 jvmRoute.valve.started=JvmRouteBinderValve started
 jvmRoute.valve.stopped=JvmRouteBinderValve stopped

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties?rev=1697844r1=1697843r2=1697844view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
 Wed Aug 26 08:00:36 2015
@@ -57,18 +57,12 @@ deltaSession.readSession = readObject()
 deltaSession.writeSession = writeObject() guardando sesi\u00F3n [{0}]
 jvmRoute.cannotFindSession = No puedo hallar sesi\u00F3n [{0}]
 jvmRoute.changeSession = Cambiada sesi\u00F3n desde [{0}] a [{1}]
-jvmRoute.clusterListener.started = Cl\u00FAster 
JvmRouteSessionIDBinderListener arrancado
-jvmRoute.clusterListener.stopped = Cl\u00FAster 
JvmRouteSessionIDBinderListener parado
 jvmRoute.configure.warn = Por favor, \u00A1configura tu JvmRouteBinderValve en 
la v\u00E1lvula de m\u00E1quina, no en la v\u00E1lvula del contexto\!
-jvmRoute.contextNotFound = \u00A1Contexto [{0}] no hallado en el nodo [{1}]\!
 jvmRoute.failover = Detectada una ca\u00EDda con diferente jvmRoute - ruta 
original\: [{0}] nueva\: [{1}] en id de sesi\u00F3n [{2}]
 jvmRoute.foundManager = Hallado Cl\u00FAster DeltaManager {0} en {1}
-jvmRoute.hostNotFound = No hallada m\u00E1quina [{0}]
-jvmRoute.lostSession = Perdida Sesi\u00F3n [{0}] en ruta [{1}]
 jvmRoute.missingJvmRouteAttribute = \u00A1No se ha configurado atributo de 
motor jvmRoute\!
 jvmRoute.noCluster = La v\u00E1lvula JvmRouterBinderValve se encuentra 
configurada, pero no se usa el cl\u00FAster. A\u00FAn funcionar\u00E1 la 
tolerancia a fallos, siempre que se est\u00E9 usando PersistentManager.
 jvmRoute.notFoundManager = No hallado Cl\u00FAster DeltaManager {0} en {1}
-jvmRoute.receiveMessage.sessionIDChanged = Cl\u00FAster 
JvmRouteSessionIDBinderListener recibi\u00F3 ID original de sesi\u00F3n [{0}] 
puesto a nuevo id [{1}] para la ruta de contexto [{2}]
 jvmRoute.turnoverInfo = Ajustado tiempo de Chequeo a {0} mseg
 jvmRoute.valve.started = JvmRouteBinderValve arrancada
 jvmRoute.valve.stopped = JvmRouteBinderValve parada



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1697843 - in /tomcat/trunk/java/org/apache/catalina/ha/session: LocalStrings.properties LocalStrings_es.properties

2015-08-26 Thread kfujino
Author: kfujino
Date: Wed Aug 26 07:59:42 2015
New Revision: 1697843

URL: http://svn.apache.org/r1697843
Log:
Remove unused message.

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=1697843r1=1697842r2=1697843view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
Wed Aug 26 07:59:42 2015
@@ -64,18 +64,12 @@ deltaSession.readSession=readObject() lo
 deltaSession.writeSession=writeObject() storing session [{0}]
 jvmRoute.cannotFindSession=Can't find session [{0}]
 jvmRoute.changeSession=Changed session from [{0}] to [{1}]
-jvmRoute.clusterListener.started=Cluster JvmRouteSessionIDBinderListener 
started
-jvmRoute.clusterListener.stopped=Cluster JvmRouteSessionIDBinderListener 
stopped
 jvmRoute.configure.warn=Please, setup your JvmRouteBinderValve at host valve, 
not at context valve!
-jvmRoute.contextNotFound=Context [{0}] not found at node [{1}]!
 jvmRoute.failover=Detected a failover with different jvmRoute - orginal route: 
[{0}] new one: [{1}] at session id [{2}]
 jvmRoute.foundManager=Found Cluster DeltaManager {0} at {1}
-jvmRoute.hostNotFound=No host found [{0}]
-jvmRoute.lostSession=Lost Session [{0}] at path [{1}]
 jvmRoute.missingJvmRouteAttribute=No engine jvmRoute attribute configured!
 jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is 
not being used. Fail over will still work, providing a PersistentManager is 
used.
 jvmRoute.notFoundManager=Not found Cluster DeltaManager at {0}
-jvmRoute.receiveMessage.sessionIDChanged=Cluster 
JvmRouteSessionIDBinderListener received orginal session ID [{0}] set to new id 
[{1}] for context path [{2}]
 jvmRoute.turnoverInfo=Turnover Check time {0} msec
 jvmRoute.valve.started=JvmRouteBinderValve started
 jvmRoute.valve.stopped=JvmRouteBinderValve stopped

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties?rev=1697843r1=1697842r2=1697843view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
Wed Aug 26 07:59:42 2015
@@ -57,18 +57,12 @@ deltaSession.readSession = readObject()
 deltaSession.writeSession = writeObject() guardando sesi\u00F3n [{0}]
 jvmRoute.cannotFindSession = No puedo hallar sesi\u00F3n [{0}]
 jvmRoute.changeSession = Cambiada sesi\u00F3n desde [{0}] a [{1}]
-jvmRoute.clusterListener.started = Cl\u00FAster 
JvmRouteSessionIDBinderListener arrancado
-jvmRoute.clusterListener.stopped = Cl\u00FAster 
JvmRouteSessionIDBinderListener parado
 jvmRoute.configure.warn = Por favor, \u00A1configura tu JvmRouteBinderValve en 
la v\u00E1lvula de m\u00E1quina, no en la v\u00E1lvula del contexto\!
-jvmRoute.contextNotFound = \u00A1Contexto [{0}] no hallado en el nodo [{1}]\!
 jvmRoute.failover = Detectada una ca\u00EDda con diferente jvmRoute - ruta 
original\: [{0}] nueva\: [{1}] en id de sesi\u00F3n [{2}]
 jvmRoute.foundManager = Hallado Cl\u00FAster DeltaManager {0} en {1}
-jvmRoute.hostNotFound = No hallada m\u00E1quina [{0}]
-jvmRoute.lostSession = Perdida Sesi\u00F3n [{0}] en ruta [{1}]
 jvmRoute.missingJvmRouteAttribute = \u00A1No se ha configurado atributo de 
motor jvmRoute\!
 jvmRoute.noCluster = La v\u00E1lvula JvmRouterBinderValve se encuentra 
configurada, pero no se usa el cl\u00FAster. A\u00FAn funcionar\u00E1 la 
tolerancia a fallos, siempre que se est\u00E9 usando PersistentManager.
 jvmRoute.notFoundManager = No hallado Cl\u00FAster DeltaManager {0} en {1}
-jvmRoute.receiveMessage.sessionIDChanged = Cl\u00FAster 
JvmRouteSessionIDBinderListener recibi\u00F3 ID original de sesi\u00F3n [{0}] 
puesto a nuevo id [{1}] para la ruta de contexto [{2}]
 jvmRoute.turnoverInfo = Ajustado tiempo de Chequeo a {0} mseg
 jvmRoute.valve.started = JvmRouteBinderValve arrancada
 jvmRoute.valve.stopped = JvmRouteBinderValve parada



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 58244] two way SSL loses client certificate after a few requests

2015-08-26 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58244

--- Comment #1 from David Balažic david.bala...@comtrade.com ---
Created attachment 33041
  -- https://bz.apache.org/bugzilla/attachment.cgi?id=33041action=edit
Test case to reproduce issue

The issue persists with the new apache-tomcat-8.0.26-windows-x64.

I attach a WAR file that can be used to reproduce the issue. Either unpack the
single JSP file in it and put it into the webapps folder under its own folder
(like tomcat/webapps/x/a.jsp) or deploy the WAR file under webapps/.

The WAR file also contains the CA's, server and client certificates that can be
used for the test.

Steps:
 - download and extract apache-tomcat-8.0.26-windows-x64.zip
 - (make sure you have a Java environment, JAVA_HOME must be set)
 - in conf/server.xml add:

Connector port=8443 protocol=org.apache.coyote.http11.Http11AprProtocol
secure=true scheme=https
maxThreads=150 URIEncoding=UTF-8 SSLVerifyClient=optional
SSLPassword=testing SSLEnabled=true
SSLCertificateKeyFile=C:\snakeoil-rsa.key
SSLCertificateFile=C:\snakeoil-rsa.crt
SSLCACertificateFile=C:\CAs.crt /

The certificate files are in the WAR file, extract them to C:\ (or elsewhere).

 - put the a.war file to the webapps folder
 - start tomcat by startup.bat
 - import the my3.p12 certificate to Firefox (the password is : test )
 - in Firefox load the page https://localhost:8443/a/a.jsp (when asked, select
the certifcate imported from my3.p12)
 - refresh the page (F5) every few seconds

Actual result: about 30 seconds after the first load of page, the page will
show a NPE instead of the certificate name

Expected: no NPE

Note: the issue usually happens in 30 seconds, but sometimes it goes on without
error for longer. If so, stop and restart tomcat and try again.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1697893 - in /tomcat/site/trunk: ./ docs/ xdocs/

2015-08-26 Thread violetagg
Author: violetagg
Date: Wed Aug 26 11:59:05 2015
New Revision: 1697893

URL: http://svn.apache.org/r1697893
Log:
Updates (excluding docs) for 7.0.64 release

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-70.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-70.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-7.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1697893r1=1697892r2=1697893view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Aug 26 11:59:05 2015
@@ -37,7 +37,7 @@ tomcat.loc=http://www.apache.org/dist/to
 
 # - Tomcat versions -
 tomcat60=6.0.43
-tomcat70=7.0.63
+tomcat70=7.0.64
 tomcat80=8.0.26
 
 

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1697893r1=1697892r2=1697893view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Aug 26 11:59:05 2015
@@ -67,8 +67,8 @@
 release
   Version
 nameLatest Stable 7.0.x Release/name
-created2015-07-06/created
-revision7.0.63/revision
+created2015-08-25/created
+revision7.0.64/revision
   /Version
 /release
 release

Modified: tomcat/site/trunk/docs/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1697893r1=1697892r2=1697893view=diff
==
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Wed Aug 26 11:59:05 2015
@@ -206,7 +206,7 @@
 h3 id=Quick_NavigationQuick Navigation/h3
 div class=text
 
-[define v]7.0.63[end]
+[define v]7.0.64[end]
 a href=https://www.apache.org/dist/tomcat/tomcat-7/KEYS;KEYS/a |
 a href=#[v][v]/a |
 a href=[preferred]tomcat/tomcat-7/v[v] rel=nofollowBrowse/a |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1697893r1=1697892r2=1697893view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Aug 26 11:59:05 2015
@@ -228,6 +228,43 @@ project logo are trademarks of the Apach
 
 
 /div
+h3 id=Tomcat_7.0.64_Released
+span style=float: right;2015-08-25/span Tomcat 7.0.64 Released/h3
+div class=text
+
+p
+The Apache Tomcat Project is proud to announce the release of version 7.0.64 of
+Apache Tomcat. This release contains a number of bug fixes
+and improvements compared to version 7.0.63. The notable changes since 7.0.63
+include:
+/p
+
+ul
+
+liAvoid an NPE when adding POJO WebSocket endpoints programmatically/li
+
+liImproved handling of async timeouts/li
+
+liFacilitate weaving by allowing ClassFileTransformer to be added to
+WebappClassLoader/li
+
+/ul
+
+
+p
+Full details of these changes, and all the other changes, are available in the
+a href=tomcat-7.0-doc/changelog.htmlTomcat 7 changelog/a.
+/p
+
+
+p style=text-align: center;
+
+a href=download-70.cgiDownload/a |
+a href=tomcat-7.0-doc/changelog.htmlChangeLog for 7.0.64/a
+
+/p
+
+/div
 h3 id=Tomcat_8.0.26_Released
 span style=float: right;2015-08-21/span Tomcat 8.0.26 Released/h3
 div class=text
@@ -282,44 +319,6 @@ found in previous releases.
 
 /p
 
-/div
-h3 id=Tomcat_7.0.63_Released
-span style=float: right;2015-07-06/span Tomcat 7.0.63 Released/h3
-div class=text
-
-p
-The Apache Tomcat Project is proud to announce the release of version 7.0.63 of
-Apache Tomcat. This release contains a number of bug fixes
-and improvements compared to version 7.0.62. The notable changes since 7.0.62
-include:
-/p
-
-ul
-
-liAdded a workaround for SPNEGO authentication and a JRE regression in Java 8
-update 40 onwards/li
-
-liAdded the new HttpHeaderSecurityFilter/li
-
-liExtended support for the Web Socket permessage-deflate extension to the
-client implementation/li
-
-/ul
-
-
-p
-Full details of these changes, and all the other changes, are available in the
-a href=tomcat-7.0-doc/changelog.htmlTomcat 7 changelog/a.
-/p
-
-
-p style=text-align: center;
-
-a href=download-70.cgiDownload/a |
-a href=tomcat-7.0-doc/changelog.htmlChangeLog for 7.0.63/a
-
-/p
-
 /div
 h3 id=Tomcat_6.0.44_Released

svn commit: r1697905 - in /tomcat/site/trunk/docs/tomcat-7.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

2015-08-26 Thread violetagg
Author: violetagg
Date: Wed Aug 26 12:33:12 2015
New Revision: 1697905

URL: http://svn.apache.org/r1697905
Log:
Update docs for Apache Tomcat 7.0.64 release.


[This commit notification would consist of 329 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 58263] APR SSL connector crashes

2015-08-26 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58263

Denis Orlov dor...@crimtan.com changed:

   What|Removed |Added

   Priority|P2  |P1

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[ANN] Apache Tomcat 7.0.64 released

2015-08-26 Thread Violeta Georgieva
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 7.0.64.

Apache Tomcat is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Expression Language and Java
WebSocket technologies.

This release contains a number of bug fixes and improvements compared to
version 7.0.63. The notable changes since 7.0.63 include:


- Avoid an NPE when adding POJO WebSocket endpoints programmatically
- Improved handling of async timeouts
- Facilitate weaving by allowing ClassFileTransformer to be added to
  WebappClassLoader


Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-7.0-doc/changelog.html

Note: This version has 4 zip binaries: a generic one and
  three bundled with Tomcat native binaries for Windows operating
  systems running on different CPU architectures.

Note: Use of the Java WebSocket 1.1 implementation requires Java 7.

Note: If you use the APR/native AJP or HTTP connector you *must* upgrade
  to version 1.1.33 or later of the APR/native library.

Downloads:
http://tomcat.apache.org/download-70.cgi

Migration guides from Apache Tomcat 5.5.x and 6.0.x:
http://tomcat.apache.org/migration.html

Enjoy

The Apache Tomcat team


svn commit: r10309 - /release/tomcat/tomcat-7/v7.0.63/

2015-08-26 Thread violetagg
Author: violetagg
Date: Wed Aug 26 12:03:59 2015
New Revision: 10309

Log:
Remove 7.0.63

Removed:
release/tomcat/tomcat-7/v7.0.63/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 58283] Change Base Path to use (user.home) instead of absolute path

2015-08-26 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58283

--- Comment #2 from Christopher Schultz ch...@christopherschultz.net ---
I'm +1 on this, but I'd like other committers to weigh-in, since it's going to
impact them more than anyone else.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1697841 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/tribes/tipis/LocalStrings.properties webapps/docs/changelog.xml

2015-08-26 Thread kfujino
Author: kfujino
Date: Wed Aug 26 07:54:10 2015
New Revision: 1697841

URL: http://svn.apache.org/r1697841
Log:
Correct log messages in case of using ReplicatedMap.

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties?rev=1697841r1=1697840r2=1697841view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
 Wed Aug 26 07:54:10 2015
@@ -21,7 +21,7 @@ abstractReplicatedMap.broadcast.noReplie
 abstractReplicatedMap.unable.diffObject=Unable to diff object. Will replicate 
the entire object instead.
 abstractReplicatedMap.unable.replicate=Unable to replicate data.
 abstractReplicatedMap.transferState.noReplies=Transfer state, 0 replies, 
probably a timeout.
-abstractReplicatedMap.unable.transferState=Unable to transfer 
LazyReplicatedMap state.
+abstractReplicatedMap.unable.transferState=Unable to transfer 
AbstractReplicatedMap state.
 abstractReplicatedMap.unable.deserialize.MapMessage=Unable to deserialize 
MapMessage.
 abstractReplicatedMap.unableApply.diff=Unable to apply diff to key:{0}
 abstractReplicatedMap.unableSelect.backup=Unable to select backup node.
@@ -29,10 +29,10 @@ abstractReplicatedMap.member.disappeared
 abstractReplicatedMap.unable.relocate=Unable to relocate[{0}] to a new backup 
node
 abstractReplicatedMap.relocate.complete=Relocation of map entries was complete 
in {0} ms.
 abstractReplicatedMap.heartbeat.failed=Unable to send 
AbstractReplicatedMap.ping message
-abstractReplicatedMap.unable.remove=Unable to replicate out data for a 
LazyReplicatedMap.remove operation
+abstractReplicatedMap.unable.remove=Unable to replicate out data for a 
AbstractReplicatedMap.remove operation
 abstractReplicatedMap.unable.retrieve=Unable to retrieve remote object for 
key:{0}
-abstractReplicatedMap.unable.get=Unable to replicate out data for a 
LazyReplicatedMap.get operation
-abstractReplicatedMap.unable.put=Unable to replicate out data for a 
LazyReplicatedMap.put operation
+abstractReplicatedMap.unable.get=Unable to replicate out data for a 
AbstractReplicatedMap.get operation
+abstractReplicatedMap.unable.put=Unable to replicate out data for a 
AbstractReplicatedMap.put operation
 abstractReplicatedMap.unsupport.operation=This operation is not valid on a 
replicated map
 mapMessage.deserialize.error.key=Deserialization error of the MapMessage.key
 mapMessage.deserialize.error.value=Deserialization error of the 
MapMessage.value

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1697841r1=1697840r2=1697841view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Aug 26 07:54:10 2015
@@ -58,6 +58,10 @@
 Add support for configurations of codeChannelListener/code and
 codeMembershipListener/code in server.xml. (kfujino)
   /add
+  fix
+Correct log messages in case of using codeReplicatedMap/code.
+(kfujino)
+  /fix
 /changelog
   /subsection
   subsection name=jdbc-pool



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org