Don't require the jars unless necessary

rkh · Feb 21, 2011 · 25896a6 · 25896a6
1 parent 148b238
commit 25896a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/lib/kirk.rb b/lib/kirk.rb
@@ -8,9 +8,10 @@ module Kirk
   end
 
   require 'java'
+  require 'kirk/common'
+  require 'kirk/version'
   require 'kirk/native'
   require 'kirk/jetty'
-  require 'kirk/version'
 
   import "java.util.concurrent.LinkedBlockingQueue"
   import "java.util.concurrent.TimeUnit"
@@ -34,7 +35,6 @@ module Applications
 
   require 'kirk/builder'
   require 'kirk/client'
-  require 'kirk/common'
   require 'kirk/handler'
   require 'kirk/input_stream'
   require 'kirk/server'

diff --git a/lib/kirk/jetty.rb b/lib/kirk/jetty.rb
@@ -1,6 +1,9 @@
-require "kirk/jetty/jetty-client-7.2.2.v20101205"
-require "kirk/jetty/jetty-server-7.2.2.v20101205"
-require "kirk/jetty/servlet-api-2.5"
+# Only require jars if in the "master" process
+unless Kirk.sub_process?
+  require "kirk/jetty/jetty-client-7.2.2.v20101205"
+  require "kirk/jetty/jetty-server-7.2.2.v20101205"
+  require "kirk/jetty/servlet-api-2.5"
+end
 
 module Kirk
   module Jetty