Author: cziegeler
Date: Wed Jun 11 08:07:13 2008
New Revision: 666696
URL: http://svn.apache.org/viewvc?rev=666696&view=rev
Log:
Remove debug logging.
Modified:
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/SlingAuthenticator.java
Modified:
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/SlingAuthenticator.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/SlingAuthenticator.java?rev=666696&r1=666695&r2=666696&view=diff
==============================================================================
---
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/SlingAuthenticator.java
(original)
+++
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/SlingAuthenticator.java
Wed Jun 11 08:07:13 2008
@@ -337,21 +337,23 @@
} else {
final List<AuthenticationHandlerInfo> infos = new
ArrayList<AuthenticationHandlerInfo>();
for (int i = 0; i < services.length; i++) {
- log.info("** Found handler reference " + services[i]);
final String paths[] =
OsgiUtil.toStringArray(services[i].getProperty(AuthenticationHandler.PATH_PROPERTY));
- log.info("** Paths " + paths);
if ( paths != null && paths.length > 0 ) {
final AuthenticationHandler handler =
(AuthenticationHandler) authHandlerTracker.getService(services[i]);
- log.info("** Handler " + handler);
for(int m = 0; m < paths.length; m++) {
- log.info("** Path " + paths[m]);
- infos.add(new AuthenticationHandlerInfo(paths[m],
handler));
+ if ( paths[m] != null && paths[m].length() > 0 ) {
+ infos.add(new
AuthenticationHandlerInfo(paths[m], handler));
+ }
}
}
}
- final AuthenticationHandlerInfo[] ac = infos.toArray(new
AuthenticationHandlerInfo[infos.size()]);
- Arrays.sort(ac, AuthenticationHandlerInfoComparator.SINGLETON);
- authHandlerCache = ac;
+ if ( infos.size() == 0 ) {
+ authHandlerCache = EMPTY_INFO;
+ } else {
+ final AuthenticationHandlerInfo[] ac = infos.toArray(new
AuthenticationHandlerInfo[infos.size()]);
+ Arrays.sort(ac,
AuthenticationHandlerInfoComparator.SINGLETON);
+ authHandlerCache = ac;
+ }
}
authHandlerTrackerCount = authHandlerTracker.getTrackingCount();
}