Index: repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoLocalItemStateManager.java
===================================================================
*** repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoLocalItemStateManager.java	(revision 24927)
--- repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoLocalItemStateManager.java	(working copy)
***************
*** 251,257 ****
      public void update()
      throws ReferentialIntegrityException, StaleItemStateException, ItemStateException, IllegalStateException {
          super.update();
!         edit();
          FilteredChangeLog tempChangeLog = filteredChangeLog;
          filteredChangeLog = null;
          parameterizedView = false;
--- 251,257 ----
      public void update()
      throws ReferentialIntegrityException, StaleItemStateException, ItemStateException, IllegalStateException {
          super.update();
!         forceEditMode();
          FilteredChangeLog tempChangeLog = filteredChangeLog;
          filteredChangeLog = null;
          parameterizedView = false;
***************
*** 292,298 ****
                  return state;
              if (id instanceof HippoNodeId) {
                  if (!virtualNodes.containsKey((NodeId)id)) {
!                     edit();
                      NodeState nodeState = (NodeState)state;
                      if (isEnabled()) {
                          nodeState = ((HippoNodeId)id).populate(currentContext, nodeState);
--- 292,298 ----
                  return state;
              if (id instanceof HippoNodeId) {
                  if (!virtualNodes.containsKey((NodeId)id)) {
!                     forceEditMode();
                      NodeState nodeState = (NodeState)state;
                      if (isEnabled()) {
                          nodeState = ((HippoNodeId)id).populate(currentContext, nodeState);
***************
*** 315,321 ****
                  NodeState nodeState = (NodeState)state;
                  Name nodeTypeName = nodeState.getNodeTypeName();
                  if (virtualNodeNames.containsKey(nodeTypeName) && !virtualStates.contains(state)) {
!                     edit();
                      int type = isVirtual(nodeState);
                      if ((type & ITEM_TYPE_EXTERNAL) != 0) {
                          nodeState.removeAllChildNodeEntries();
--- 315,321 ----
                  NodeState nodeState = (NodeState)state;
                  Name nodeTypeName = nodeState.getNodeTypeName();
                  if (virtualNodeNames.containsKey(nodeTypeName) && !virtualStates.contains(state)) {
!                     forceEditMode();
                      int type = isVirtual(nodeState);
                      if ((type & ITEM_TYPE_EXTERNAL) != 0) {
                          nodeState.removeAllChildNodeEntries();
***************
*** 383,389 ****
          if(virtualNodes.containsKey(id)) {
              state = (NodeState) virtualNodes.get(id);
          } else if(state == null && id instanceof HippoNodeId) {
!             edit();
              NodeState nodeState;
              if (isEnabled()) {
                  nodeState = ((HippoNodeId)id).populate(currentContext);
--- 383,389 ----
          if(virtualNodes.containsKey(id)) {
              state = (NodeState) virtualNodes.get(id);
          } else if(state == null && id instanceof HippoNodeId) {
!             forceEditMode();
              NodeState nodeState;
              if (isEnabled()) {
                  nodeState = ((HippoNodeId)id).populate(currentContext);
Index: jackrabbit.patch
===================================================================
*** jackrabbit.patch	(revision 24928)
--- jackrabbit.patch	(working copy)
***************
*** 96,101 ****
--- 96,114 ----
        }
    
        /**
+ ***************
+ *** 246,251 ****
+ --- 250,259 ----
+           return editMode;
+       }
+   
+ +     public void forceEditMode() {
+ +          editMode = true;
+ +    }
+ + 
+       /**
+        * {@inheritDoc}
+        */
  Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
  ===================================================================
  *** jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java	(revision 923523)
***************
*** 272,278 ****
      </parent>
      <artifactId>jackrabbit-core</artifactId>
      <name>Jackrabbit Core</name>
! !   <version>1.5.7-h6</version>
      <description>Jackrabbit content repository implementation</description>
    
      <properties>
--- 285,291 ----
      </parent>
      <artifactId>jackrabbit-core</artifactId>
      <name>Jackrabbit Core</name>
! !   <version>1.5.7-h7</version>
      <description>Jackrabbit content repository implementation</description>
    
      <properties>
***************
*** 338,344 ****
        <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-core</artifactId>
! !       <version>1.5.7-h6</version>
          <scope>test</scope>
        </dependency>
        <dependency>
--- 351,357 ----
        <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-core</artifactId>
! !       <version>1.5.7-h7</version>
          <scope>test</scope>
        </dependency>
        <dependency>
***************
*** 359,365 ****
        <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-core</artifactId>
! !       <version>1.5.7-h6</version>
          <exclusions>
            <exclusion>
              <groupId>commons-logging</groupId>
--- 372,378 ----
        <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-core</artifactId>
! !       <version>1.5.7-h7</version>
          <exclusions>
            <exclusion>
              <groupId>commons-logging</groupId>
***************
*** 380,386 ****
        <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-core</artifactId>
! !       <version>1.5.7-h6</version>
        </dependency>
        <dependency>
          <groupId>org.slf4j</groupId>
--- 393,399 ----
        <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-core</artifactId>
! !       <version>1.5.7-h7</version>
        </dependency>
        <dependency>
          <groupId>org.slf4j</groupId>
***************
*** 401,407 ****
        <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-core</artifactId>
! !       <version>1.5.7-h6</version>
          <optional>true</optional>
        </dependency>
      </dependencies>
--- 414,420 ----
        <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-core</artifactId>
! !       <version>1.5.7-h7</version>
          <optional>true</optional>
        </dependency>
      </dependencies>
***************
*** 422,428 ****
        <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-core</artifactId>
! !       <version>1.5.7-h6</version>
          <scope>test</scope>
        </dependency>
        <dependency>
--- 435,441 ----
        <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-core</artifactId>
! !       <version>1.5.7-h7</version>
          <scope>test</scope>
        </dependency>
        <dependency>
***************
*** 443,449 ****
        <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-core</artifactId>
! !       <version>1.5.7-h6</version>
          <scope>test</scope>
        </dependency>
        <dependency>
--- 456,462 ----
        <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-core</artifactId>
! !       <version>1.5.7-h7</version>
          <scope>test</scope>
        </dependency>
        <dependency>
***************
*** 464,470 ****
        <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-core</artifactId>
! !       <version>1.5.7-h6</version>
          <exclusions>
            <exclusion>
              <groupId>commons-logging</groupId>
--- 477,483 ----
        <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-core</artifactId>
! !       <version>1.5.7-h7</version>
          <exclusions>
            <exclusion>
              <groupId>commons-logging</groupId>