incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jus...@apache.org
Subject svn commit: r1147158 - in /sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad: base/impl/Sling.java webapp/SlingServlet.java
Date Fri, 15 Jul 2011 14:02:02 GMT
Author: justin
Date: Fri Jul 15 14:02:02 2011
New Revision: 1147158

URL: http://svn.apache.org/viewvc?rev=1147158&view=rev
Log:
SLING-2088 - adding comment about code duplication

Modified:
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingServlet.java

Modified: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java?rev=1147158&r1=1147157&r2=1147158&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
(original)
+++ sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
Fri Jul 15 14:02:02 2011
@@ -948,6 +948,9 @@ public class Sling implements BundleActi
      * as nested variable placeholders, which are substituted from inner most to
      * outer most. Configuration properties override system properties.
      *
+     * NOTE - this is a verbatim copy of the same-named method
+     * in o.a.s.launchpad.webapp.SlingServlet. Please keep them in sync.
+     *
      * @param val The string on which to perform property substitution.
      * @param currentKey The key of the property being evaluated used to detect
      *            cycles.

Modified: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingServlet.java?rev=1147158&r1=1147157&r2=1147158&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingServlet.java
(original)
+++ sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingServlet.java
Fri Jul 15 14:02:02 2011
@@ -517,6 +517,9 @@ public class SlingServlet extends Generi
      * as nested variable placeholders, which are substituted from inner most to
      * outer most. Configuration properties override system properties.
      *
+     * NOTE - this is a verbatim copy of the same-named method
+     * in o.a.s.launchpad.base.impl.Sling. Please keep them in sync.
+     *
      * @param val The string on which to perform property substitution.
      * @param currentKey The key of the property being evaluated used to detect
      *            cycles.



Mime
View raw message