Skip to content

Commit

Permalink
Revert "uncomment Reactor factory - trigger hudson"
Browse files Browse the repository at this point in the history
This reverts commit 9c7de5e.
  • Loading branch information
graemerocher committed May 30, 2013
1 parent 34294a1 commit bfedb65
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions grails-async/src/main/groovy/grails/async/Promises.groovy
Expand Up @@ -19,7 +19,6 @@ import groovy.transform.CompileStatic
import org.grails.async.decorator.PromiseDecorator
import org.grails.async.factory.SynchronousPromiseFactory
import org.grails.async.factory.gpars.GparsPromiseFactory
import org.grails.async.factory.reactor.ReactorPromiseFactory
//import org.grails.async.factory.reactor.ReactorPromiseFactory

/**
Expand All @@ -34,23 +33,23 @@ class Promises {
static PromiseFactory promiseFactory

static {
if (ReactorPromiseFactory.isReactorAvailable()) {
promiseFactory = new ReactorPromiseFactory()
}
else if (GparsPromiseFactory.isGparsAvailable()) {
if (GparsPromiseFactory.isGparsAvailable()) {
promiseFactory = new GparsPromiseFactory()
}
/*else if (ReactorPromiseFactory.isReactorAvailable()) {
promiseFactory = new ReactorPromiseFactory()
}*/
else {
promiseFactory = new SynchronousPromiseFactory()
}
}

static PromiseFactory getPromiseFactory() {
if (promiseFactory == null) {
if (ReactorPromiseFactory.isReactorAvailable()) {
promiseFactory = new ReactorPromiseFactory()
}
else
// if (ReactorPromiseFactory.isReactorAvailable()) {
// promiseFactory = new ReactorPromiseFactory()
// }
// else
if (GparsPromiseFactory.isGparsAvailable()) {
promiseFactory = new GparsPromiseFactory()
}
Expand Down

0 comments on commit bfedb65

Please sign in to comment.