diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2011-10-17 11:41:57 +0000 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2011-10-17 11:41:57 +0000 |
| commit | 6974cca537ab14f5a5688b64e5cf549101b90137 (patch) | |
| tree | 97de08a442b1f748605a4b1c0cc29481acb4fb54 /src/compiler | |
| parent | 240fb16547001e37130a7e2f0b20f15863efddda (diff) | |
| download | scala-6974cca537ab14f5a5688b64e5cf549101b90137.tar.gz scala-6974cca537ab14f5a5688b64e5cf549101b90137.tar.bz2 scala-6974cca537ab14f5a5688b64e5cf549101b90137.zip | |
Do not depend on java.rmi.* when not necessary.
This is small correction of fix committed in r25814. We need to swap
terms in logical conjuction so java.rmi.* stuff is accessed only if
triggered by @remote annotation.
No review.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 11178ac0f6..683ed9317d 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -880,8 +880,8 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid with */ private def addRemoteException(jmethod: JMethod, meth: Symbol) { val needsAnnotation = ( - !(meth.throwsAnnotations contains RemoteExceptionClass) - && (isRemoteClass || (meth hasAnnotation RemoteAttr) && jmethod.isPublic) + (isRemoteClass || (meth hasAnnotation RemoteAttr) && jmethod.isPublic) + && !(meth.throwsAnnotations contains RemoteExceptionClass) ) if (needsAnnotation) { val c = Constant(RemoteExceptionClass.tpe) |