Author: [email protected]
Date: Mon Aug 1 17:14:57 2011
New Revision: 1234
Log:
AMDATU-394 reverting web and core changes commited by accident in r1233
Modified:
trunk/amdatu-core/useradmincache/src/main/java/org/amdatu/core/useradmincache/service/UserAdminCache.java
trunk/amdatu-core/useradmincache/src/test/java/org/amdatu/useradmincache/test/UserAdminCacheTest.java
trunk/amdatu-core/useradmincache/src/test/java/org/amdatu/useradmincache/test/UserAdminMock.java
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/osgi/DispatcherServiceActivator.java
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/service/DispatcherServiceImpl.java
Modified:
trunk/amdatu-core/useradmincache/src/main/java/org/amdatu/core/useradmincache/service/UserAdminCache.java
==============================================================================
---
trunk/amdatu-core/useradmincache/src/main/java/org/amdatu/core/useradmincache/service/UserAdminCache.java
(original)
+++
trunk/amdatu-core/useradmincache/src/main/java/org/amdatu/core/useradmincache/service/UserAdminCache.java
Mon Aug 1 17:14:57 2011
@@ -84,16 +84,29 @@
public Role createRole(String name, int type) {
Role newRole = m_userAdmin.createRole(name, type);
if (newRole != null) {
- CachedRole role = createCachedRole(newRole);
m_roleCacheLock.writeLock().lock();
try {
- m_roleCache.put(role.getName(), role);
+ CachedRole role = createCachedRole(newRole);
+ m_roleCache.put(role.getName(), role);
+ m_filteredRoleCacheLock.writeLock().lock();
+ try {
+ for (Entry<String, Role[]> roles :
m_filteredRoleCache.entrySet()) {
+ Role[] newRoles = new Role[roles.getValue().length+1];
+ for (int i=0; i<roles.getValue().length; i++) {
+ newRoles[i] = roles.getValue()[i];
+ }
+ newRoles[roles.getValue().length] = role;
+ m_filteredRoleCache.put(roles.getKey(), newRoles);
+ }
+ return role;
+ }
+ finally {
+ m_filteredRoleCacheLock.writeLock().unlock();
+ }
}
finally {
m_roleCacheLock.writeLock().unlock();
}
- flushFilteredRoleCache();
- return role;
}
return null;
}
Modified:
trunk/amdatu-core/useradmincache/src/test/java/org/amdatu/useradmincache/test/UserAdminCacheTest.java
==============================================================================
---
trunk/amdatu-core/useradmincache/src/test/java/org/amdatu/useradmincache/test/UserAdminCacheTest.java
(original)
+++
trunk/amdatu-core/useradmincache/src/test/java/org/amdatu/useradmincache/test/UserAdminCacheTest.java
Mon Aug 1 17:14:57 2011
@@ -70,14 +70,6 @@
}
@Test
- public void testNPE() throws Exception {
- // Create the UserAdminCache
- UserAdminCache userAdminCache = createUserAdmin();
- userAdminCache.getRoles(null);
- userAdminCache.createRole("NPE", Role.USER);
- }
-
- @Test
public void testNonalphanumeric() throws Exception {
// Create the UserAdminCache
UserAdminCache userAdminCache = createUserAdmin();
@@ -217,7 +209,7 @@
Assert.assertNull(m_userAdmin.getUser(propKey, "testvalue"));
Assert.assertNotNull(m_userAdmin.getUser(propKey,
"testvalue2"));
filteredRoles = m_userAdmin.getRoles(filter);
-// Assert.assertTrue(filteredRoles.length == 0);
+ Assert.assertTrue(filteredRoles.length == 0);
Assert.assertTrue(m_userAdmin.getRole(userName).getProperties().get(propKey).equals("testvalue2"));
// Test get all roles
Modified:
trunk/amdatu-core/useradmincache/src/test/java/org/amdatu/useradmincache/test/UserAdminMock.java
==============================================================================
---
trunk/amdatu-core/useradmincache/src/test/java/org/amdatu/useradmincache/test/UserAdminMock.java
(original)
+++
trunk/amdatu-core/useradmincache/src/test/java/org/amdatu/useradmincache/test/UserAdminMock.java
Mon Aug 1 17:14:57 2011
@@ -86,15 +86,11 @@
if (role.getProperties() != null &&
value.equals(role.getProperties().get(key))) {
result.add(role);
}
- }
- if(result.size() > 0){
- return result.toArray(new Role[result.size()]);
}
- }
- if(m_roles.size() > 0){
- return m_roles.toArray(new Role[m_roles.size()]);
+ return result.toArray(new Role[result.size()]);
}
- return null;
+ return m_roles.toArray(new Role[m_roles.size()]);
+
}
public synchronized User getUser(String key, String value) {
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/osgi/DispatcherServiceActivator.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/osgi/DispatcherServiceActivator.java
(original)
+++
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/osgi/DispatcherServiceActivator.java
Mon Aug 1 17:14:57 2011
@@ -20,7 +20,6 @@
import javax.servlet.Filter;
import javax.servlet.Servlet;
-import javax.servlet.http.HttpServlet;
import org.amdatu.web.dispatcher.DispatchExtenderFilter;
import org.amdatu.web.dispatcher.DispatcherService;
@@ -61,11 +60,6 @@
.setRequired(false))
.add(
createServiceDependency()
- .setService(HttpServlet.class)
- .setCallbacks("addServlet", "removeServlet")
- .setRequired(false))
- .add(
- createServiceDependency()
.setService(HttpContext.class)
.setCallbacks("addHttpContext",
"removeHttpContext")
.setRequired(false))
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/service/DispatcherServiceImpl.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/service/DispatcherServiceImpl.java
(original)
+++
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/service/DispatcherServiceImpl.java
Mon Aug 1 17:14:57 2011
@@ -119,7 +119,7 @@
}
public void addServlet(ServiceReference serviceReference, Object service) {
- Servlet servlet = (Servlet) service;
+ Servlet servlet = (Servlet) service;
m_servletHandlerRegistry.addServletHandler(serviceReference, servlet);
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
