Merge pull request sakaiproject#61 from buckett/KNL-1298

KNL-1298 Allow subclasses of ResourceLoader for easier testing.
marktriggs · Jan 21, 2015 · 7f73f40 · 7f73f40
2 parents f3ee053 + e84f931
commit 7f73f40
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/kernel/kernel-util/src/main/java/org/sakaiproject/util/ResourceLoader.java b/kernel/kernel-util/src/main/java/org/sakaiproject/util/ResourceLoader.java
@@ -80,7 +80,7 @@ public String getUserId() {
 	private final static Object LOCK = new Object();
 
 	private static SessionManager sessionManager;
-	protected static SessionManager getSessionManager() {
+	protected SessionManager getSessionManager() {
         if (sessionManager == null) {
             synchronized (LOCK) {
                 sessionManager = (SessionManager) ComponentManager.get(SessionManager.class);
@@ -90,7 +90,7 @@ protected static SessionManager getSessionManager() {
 	}
 
 	private static PreferencesService preferencesService;
-	protected static PreferencesService getPreferencesService() {
+	protected PreferencesService getPreferencesService() {
 	    if (preferencesService == null) {
 	        synchronized (LOCK) {
 	            preferencesService = (PreferencesService) ComponentManager.get(PreferencesService.class);