diff --git a/src/main/java/org/red5/server/persistence/FilePersistence.java b/src/main/java/org/red5/server/persistence/FilePersistence.java index 586886729..88276f383 100644 --- a/src/main/java/org/red5/server/persistence/FilePersistence.java +++ b/src/main/java/org/red5/server/persistence/FilePersistence.java @@ -114,7 +114,7 @@ public FilePersistence(IScope scope) { if (ctx.hasBean(ISchedulingService.BEAN_NAME)) { schedulingService = (ISchedulingService) ctx.getBean(ISchedulingService.BEAN_NAME); } else { - //try the parent + // try the parent schedulingService = (ISchedulingService) scope.getParent().getContext().getBean(ISchedulingService.BEAN_NAME); } // add the job diff --git a/src/main/java/org/red5/server/scope/BroadcastScope.java b/src/main/java/org/red5/server/scope/BroadcastScope.java index cc31b5598..11c377195 100644 --- a/src/main/java/org/red5/server/scope/BroadcastScope.java +++ b/src/main/java/org/red5/server/scope/BroadcastScope.java @@ -46,12 +46,12 @@ public class BroadcastScope extends BasicScope implements IBroadcastScope, IPipe /** * Broadcasting stream associated with this scope */ - private IClientBroadcastStream clientBroadcastStream; + private transient IClientBroadcastStream clientBroadcastStream; /** * Simple in memory push pipe, triggered by an active provider to push messages to consumer */ - private InMemoryPushPushPipe pipe; + private transient InMemoryPushPushPipe pipe; /** * Number of components. diff --git a/src/main/java/org/red5/server/scope/GlobalScope.java b/src/main/java/org/red5/server/scope/GlobalScope.java index 0c21ca33e..a242eebde 100644 --- a/src/main/java/org/red5/server/scope/GlobalScope.java +++ b/src/main/java/org/red5/server/scope/GlobalScope.java @@ -38,7 +38,7 @@ public class GlobalScope extends Scope implements IGlobalScope, GlobalScopeMXBean { // Red5 Server instance - protected IServer server; + protected transient IServer server; { type = ScopeType.GLOBAL; diff --git a/src/main/java/org/red5/server/scope/WebScope.java b/src/main/java/org/red5/server/scope/WebScope.java index 6f87a83a7..52971569b 100644 --- a/src/main/java/org/red5/server/scope/WebScope.java +++ b/src/main/java/org/red5/server/scope/WebScope.java @@ -60,12 +60,22 @@ public class WebScope extends Scope implements ServletContextAware, WebScopeMXBe /** * Server instance */ - protected IServer server; + protected transient IServer server; + + /** + * The application context this webscope is running in. + */ + protected transient IApplicationContext appContext; + + /** + * Loader for new applications. + */ + protected transient IApplicationLoader appLoader; /** * Servlet context */ - protected ServletContext servletContext; + protected transient ServletContext servletContext; /** * Context path @@ -87,16 +97,6 @@ public class WebScope extends Scope implements ServletContextAware, WebScopeMXBe */ protected AtomicBoolean registered = new AtomicBoolean(false); - /** - * The application context this webscope is running in. - */ - protected IApplicationContext appContext; - - /** - * Loader for new applications. - */ - protected IApplicationLoader appLoader; - /** * Is the scope currently shutting down? */