Merge fix for glassfish compatibility

newrelic · Jun 18, 2009 · 2819f6f · 2819f6f
1 parent f9b4568
commit 2819f6f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/new_relic/local_environment.rb b/lib/new_relic/local_environment.rb
@@ -157,8 +157,10 @@ def discover_framework
 
     def check_for_glassfish
       return unless defined?(Java) &&
-         (com.sun.grizzly.jruby.rack.DefaultRackApplicationFactory rescue nil) &&
-         defined?(com::sun::grizzly::jruby::rack::DefaultRackApplicationFactory)
+         (((com.sun.grizzly.jruby.rack.DefaultRackApplicationFactory rescue nil) &&
+         defined?(com::sun::grizzly::jruby::rack::DefaultRackApplicationFactory)) ||
+         ((org.jruby.rack.DefaultRackApplicationFactory rescue nil) &&
+         defined?(org::jruby::rack::DefaultRackApplicationFactory)))
       @dispatcher = :glassfish
     end