Skip to content

Commit

Permalink
Fixes for issue 39
Browse files Browse the repository at this point in the history
  • Loading branch information
mondain committed Dec 13, 2014
1 parent 57680c8 commit 46d257f
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/red5/server/scope/BroadcastScope.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/server/scope/GlobalScope.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/org/red5/server/scope/WebScope.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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?
*/
Expand Down

0 comments on commit 46d257f

Please sign in to comment.