Index: /branches/1.2/xcache.c
===================================================================
--- /branches/1.2/xcache.c	(revision 439)
+++ /branches/1.2/xcache.c	(revision 446)
@@ -547,4 +547,5 @@
 	zend_uint i;
 	xc_entry_data_php_t *p = xce->data.php;
+	zend_op_array *old_active_op_array = CG(active_op_array);
 #ifndef ZEND_ENGINE_2
 	/* new ptr which is stored inside CG(class_table) */
@@ -612,4 +613,5 @@
 	free_alloca(new_cest_ptrs);
 #endif
+	CG(active_op_array) = old_active_op_array;
 	return p->op_array;
 }
@@ -1145,6 +1147,8 @@
 	}
 	else {
+		zend_op_array *old_active_op_array = CG(active_op_array);
 		CG(active_op_array) = op_array;
 		xc_sandbox_free(&sandbox, XC_Install TSRMLS_CC);
+		CG(active_op_array) = old_active_op_array;
 	}