From bfaa73e24dcde92a05498258d5711391f648d669 Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Mon, 19 Oct 2009 16:17:16 +0000
Subject: [292684]  InternalCDOView.handleChangeSubscription etc. get called on
 deactivated views https://bugs.eclipse.org/bugs/show_bug.cgi?id=292684

---
 .../src/org/eclipse/emf/internal/cdo/messages/messages.properties       | 2 +-
 .../src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse')

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties
index f6f81aa3c9..673a0e4c75 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties
@@ -22,7 +22,7 @@ CDOSessionConfigurationImpl.0=Session is already open
 CDOSessionConfigurationImpl.1=Session is not open
 CDOSessionFactory.1=Query is empty: {0}
 CDOSessionImpl.0=Generated packages locally not available: {0}
-CDOSessionImpl.1=Commit notification arrived while session is inactive
+CDOSessionImpl.1=Commit notification arrived while view is inactive
 CDOSessionImpl.2=Commit notification arrived while session is inactive
 CDOStaleReferencePolicy.0=EXCEPTION
 CDOStaleReferencePolicy.1=PROXY
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
index 9ebeb28eab..97a47cc1fb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
@@ -618,7 +618,7 @@ public abstract class CDOSessionImpl extends Container<CDOView> implements Inter
                   throw ex;
                 }
 
-                if (isActive())
+                if (view.isActive())
                 {
                   OM.LOG.error(ex);
                 }
-- 
cgit v1.2.3