Author: mturk
Date: Sun Nov 26 02:01:09 2006
New Revision: 479324
URL: http://svn.apache.org/viewvc?view=rev&rev=479324
Log:
Revert second name for jvm_route.
We'll either deprecate jvm_route and use route instead,
or keep the existing directive.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_util.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=479324&r1=479323&r2=479324
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sun Nov 26 02:01:09 2006
@@ -66,7 +66,6 @@
#define STICKY_SESSION ("sticky_session")
#define STICKY_SESSION_FORCE ("sticky_session_force")
#define JVM_ROUTE_OF_WORKER ("jvm_route")
-#define ROUTE_OF_WORKER ("route")
#define DOMAIN_OF_WORKER ("domain")
#define REDIRECT_OF_WORKER ("redirect")
#define MOUNT_OF_WORKER ("mount")
@@ -153,7 +152,6 @@
STICKY_SESSION,
STICKY_SESSION_FORCE,
JVM_ROUTE_OF_WORKER,
- ROUTE_OF_WORKER,
DOMAIN_OF_WORKER,
REDIRECT_OF_WORKER,
METHOD_OF_WORKER,
@@ -483,18 +481,12 @@
const char *jk_get_worker_jvm_route(jk_map_t *m, const char *wname, const char
*def)
{
- const char *rv;
char buf[1024];
if (!m || !wname) {
return NULL;
}
- MAKE_WORKER_PARAM(ROUTE_OF_WORKER);
- rv = jk_map_get_string(m, buf, def);
- if (!rv) {
- MAKE_WORKER_PARAM(JVM_ROUTE_OF_WORKER);
- rv = jk_map_get_string(m, buf, def);
- }
- return rv;
+ MAKE_WORKER_PARAM(JVM_ROUTE_OF_WORKER);
+ return jk_map_get_string(m, buf, def);
}
const char *jk_get_worker_domain(jk_map_t *m, const char *wname, const char
*def)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
