Skip to content

Commit fa1af64

Browse files
Merge pull request #107 from benjchristensen/performance
Performance: Reduce synchronization
2 parents 48cd6cc + 6e0a154 commit fa1af64

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+893
-712
lines changed

language-adaptors/rxjava-clojure/src/main/java/rx/lang/clojure/ClojureAdaptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.mockito.MockitoAnnotations;
2424

2525
import rx.observables.Observer;
26-
import rx.util.FunctionLanguageAdaptor;
26+
import rx.util.functions.FunctionLanguageAdaptor;
2727

2828
import clojure.lang.IFn;
2929
import clojure.lang.RT;

language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyAdaptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import rx.observables.Observable;
3434
import rx.observables.Observer;
3535
import rx.observables.Subscription;
36-
import rx.util.FunctionLanguageAdaptor;
36+
import rx.util.functions.FunctionLanguageAdaptor;
3737

3838
public class GroovyAdaptor implements FunctionLanguageAdaptor {
3939

language-adaptors/rxjava-jruby/src/main/java/rx/lang/jruby/JRubyAdaptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import rx.observables.Observable;
3535
import rx.observables.Observer;
3636
import rx.observables.Subscription;
37-
import rx.util.FunctionLanguageAdaptor;
37+
import rx.util.functions.FunctionLanguageAdaptor;
3838

3939
public class JRubyAdaptor implements FunctionLanguageAdaptor {
4040

rxjava-core/src/main/java/rx/concurrency/package-info.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/**
22
* Copyright 2013 Netflix, Inc.
3-
*
3+
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
1212
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

rxjava-core/src/main/java/rx/observables/Notification.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/**
22
* Copyright 2013 Netflix, Inc.
3-
*
3+
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
1212
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

0 commit comments

Comments
 (0)