Author: markt
Date: Wed Oct 19 09:51:42 2011
New Revision: 1186063
URL: http://svn.apache.org/viewvc?rev=1186063&view=rev
Log:
Sync with trunk.
Whitespace only.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1186063&r1=1186062&r2=1186063&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java Wed
Oct 19 09:51:42 2011
@@ -186,11 +186,10 @@ public class StandardHost extends Contai
*/
@Override
public String getAppBase() {
-
return (this.appBase);
-
}
+
/**
* Return the XML root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
@@ -203,6 +202,7 @@ public class StandardHost extends Contai
}
+
/**
* Set the application root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
@@ -218,6 +218,7 @@ public class StandardHost extends Contai
}
+
/**
* Set the Xml root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
@@ -234,6 +235,7 @@ public class StandardHost extends Contai
}
+
/**
* Returns true if the Host will attempt to create directories for appBase
and xmlBase
* unless they already exist.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java?rev=1186063&r1=1186062&r2=1186063&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
Wed Oct 19 09:51:42 2011
@@ -97,5 +97,4 @@ public final class RemoteAddrFilter
protected Log getLogger() {
return log;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
