Skip to content

Z
ZEO
Commit 949cb8e5 authored by Jim Fulton's avatar Jim Fulton
Browse files
Options

Fixed minor error handling bug in reinit.

parent 70a8e2a0
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 156 deletions
src/Persistence/cPersistence.c
View file @ 949cb8e5
/*
/***********************************************************************
$Id: cPersistence.c,v 1.19 1997/09/18 19:53:46 jim Exp $
$Id: cPersistence.c,v 1.20 1997/11/13 19:46:24 jim Exp $
C Persistence Module
......@@ -8,55 +8,11 @@
Copyright 1996 Digital Creations, L.C., 910 Princess Anne
Street, Suite 300, Fredericksburg, Virginia 22401 U.S.A. All
rights reserved. Copyright in this software is owned by DCLC,
unless otherwise indicated. Permission to use, copy and
distribute this software is hereby granted, provided that the
above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear. Note that
any product, process or technology described in this software
may be the subject of other Intellectual Property rights
reserved by Digital Creations, L.C. and are not licensed
hereunder.
Trademarks
Digital Creations & DCLC, are trademarks of Digital Creations, L.C..
All other trademarks are owned by their respective companies.
No Warranty
The software is provided "as is" without warranty of any kind,
either express or implied, including, but not limited to, the
implied warranties of merchantability, fitness for a particular
purpose, or non-infringement. This software could include
technical inaccuracies or typographical errors. Changes are
periodically made to the software; these changes will be
incorporated in new editions of the software. DCLC may make
improvements and/or changes in this software at any time
without notice.
Limitation Of Liability
In no event will DCLC be liable for direct, indirect, special,
incidental, economic, cover, or consequential damages arising
out of the use of or inability to use this software even if
advised of the possibility of such damages. Some states do not
allow the exclusion or limitation of implied warranties or
limitation of liability for incidental or consequential
damages, so the above limitation or exclusion may not apply to
you.
If you have questions regarding this software,
contact:
Jim Fulton, jim@digicool.com
Digital Creations L.C.
(540) 371-6909
rights reserved.
*****************************************************************************/
static char *what_string = "$Id: cPersistence.c,v 1.19 1997/09/18 19:53:46 jim Exp $";
static char *what_string = "$Id: cPersistence.c,v 1.20 1997/11/13 19:46:24 jim Exp $";
#include <time.h>
#include "cPersistence.h"
......@@ -445,12 +401,16 @@ Per__p___reinit__(cPersistentObject *self, PyObject *args)
Py_DECREF(copy);
Py_DECREF(init);
}
else if(HasInstDict(self) && (dict=INSTANCE_DICT(self)))
else
{
PyErr_Clear();
if(HasInstDict(self) && (dict=INSTANCE_DICT(self)))
{
PyDict_Clear(dict);
self->state=cPersistent_GHOST_STATE;
}
}
}
else
{
PyErr_Clear();
......@@ -940,7 +900,7 @@ void
initcPersistence()
{
PyObject *m, *d;
char *rev="$Revision: 1.19 $";
char *rev="$Revision: 1.20 $";
PATimeType.ob_type=&PyType_Type;
......@@ -967,6 +927,9 @@ initcPersistence()
/****************************************************************************
$Log: cPersistence.c,v $
Revision 1.20 1997/11/13 19:46:24 jim
Fixed minor error handling bug in reinit.
Revision 1.19 1997/09/18 19:53:46 jim
Added attribute, _p_state.
......
src/ZODB/cPersistence.c
View file @ 949cb8e5
/*
/***********************************************************************
$Id: cPersistence.c,v 1.19 1997/09/18 19:53:46 jim Exp $
$Id: cPersistence.c,v 1.20 1997/11/13 19:46:24 jim Exp $
C Persistence Module
......@@ -8,55 +8,11 @@
Copyright 1996 Digital Creations, L.C., 910 Princess Anne
Street, Suite 300, Fredericksburg, Virginia 22401 U.S.A. All
rights reserved. Copyright in this software is owned by DCLC,
unless otherwise indicated. Permission to use, copy and
distribute this software is hereby granted, provided that the
above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear. Note that
any product, process or technology described in this software
may be the subject of other Intellectual Property rights
reserved by Digital Creations, L.C. and are not licensed
hereunder.
Trademarks
Digital Creations & DCLC, are trademarks of Digital Creations, L.C..
All other trademarks are owned by their respective companies.
No Warranty
The software is provided "as is" without warranty of any kind,
either express or implied, including, but not limited to, the
implied warranties of merchantability, fitness for a particular
purpose, or non-infringement. This software could include
technical inaccuracies or typographical errors. Changes are
periodically made to the software; these changes will be
incorporated in new editions of the software. DCLC may make
improvements and/or changes in this software at any time
without notice.
Limitation Of Liability
In no event will DCLC be liable for direct, indirect, special,
incidental, economic, cover, or consequential damages arising
out of the use of or inability to use this software even if
advised of the possibility of such damages. Some states do not
allow the exclusion or limitation of implied warranties or
limitation of liability for incidental or consequential
damages, so the above limitation or exclusion may not apply to
you.
If you have questions regarding this software,
contact:
Jim Fulton, jim@digicool.com
Digital Creations L.C.
(540) 371-6909
rights reserved.
*****************************************************************************/
static char *what_string = "$Id: cPersistence.c,v 1.19 1997/09/18 19:53:46 jim Exp $";
static char *what_string = "$Id: cPersistence.c,v 1.20 1997/11/13 19:46:24 jim Exp $";
#include <time.h>
#include "cPersistence.h"
......@@ -445,12 +401,16 @@ Per__p___reinit__(cPersistentObject *self, PyObject *args)
Py_DECREF(copy);
Py_DECREF(init);
}
else if(HasInstDict(self) && (dict=INSTANCE_DICT(self)))
else
{
PyErr_Clear();
if(HasInstDict(self) && (dict=INSTANCE_DICT(self)))
{
PyDict_Clear(dict);
self->state=cPersistent_GHOST_STATE;
}
}
}
else
{
PyErr_Clear();
......@@ -940,7 +900,7 @@ void
initcPersistence()
{
PyObject *m, *d;
char *rev="$Revision: 1.19 $";
char *rev="$Revision: 1.20 $";
PATimeType.ob_type=&PyType_Type;
......@@ -967,6 +927,9 @@ initcPersistence()
/****************************************************************************
$Log: cPersistence.c,v $
Revision 1.20 1997/11/13 19:46:24 jim
Fixed minor error handling bug in reinit.
Revision 1.19 1997/09/18 19:53:46 jim
Added attribute, _p_state.
......
src/persistent/cPersistence.c
View file @ 949cb8e5
/*
/***********************************************************************
$Id: cPersistence.c,v 1.19 1997/09/18 19:53:46 jim Exp $
$Id: cPersistence.c,v 1.20 1997/11/13 19:46:24 jim Exp $
C Persistence Module
......@@ -8,55 +8,11 @@
Copyright 1996 Digital Creations, L.C., 910 Princess Anne
Street, Suite 300, Fredericksburg, Virginia 22401 U.S.A. All
rights reserved. Copyright in this software is owned by DCLC,
unless otherwise indicated. Permission to use, copy and
distribute this software is hereby granted, provided that the
above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear. Note that
any product, process or technology described in this software
may be the subject of other Intellectual Property rights
reserved by Digital Creations, L.C. and are not licensed
hereunder.
Trademarks
Digital Creations & DCLC, are trademarks of Digital Creations, L.C..
All other trademarks are owned by their respective companies.
No Warranty
The software is provided "as is" without warranty of any kind,
either express or implied, including, but not limited to, the
implied warranties of merchantability, fitness for a particular
purpose, or non-infringement. This software could include
technical inaccuracies or typographical errors. Changes are
periodically made to the software; these changes will be
incorporated in new editions of the software. DCLC may make
improvements and/or changes in this software at any time
without notice.
Limitation Of Liability
In no event will DCLC be liable for direct, indirect, special,
incidental, economic, cover, or consequential damages arising
out of the use of or inability to use this software even if
advised of the possibility of such damages. Some states do not
allow the exclusion or limitation of implied warranties or
limitation of liability for incidental or consequential
damages, so the above limitation or exclusion may not apply to
you.
If you have questions regarding this software,
contact:
Jim Fulton, jim@digicool.com
Digital Creations L.C.
(540) 371-6909
rights reserved.
*****************************************************************************/
static char *what_string = "$Id: cPersistence.c,v 1.19 1997/09/18 19:53:46 jim Exp $";
static char *what_string = "$Id: cPersistence.c,v 1.20 1997/11/13 19:46:24 jim Exp $";
#include <time.h>
#include "cPersistence.h"
......@@ -445,12 +401,16 @@ Per__p___reinit__(cPersistentObject *self, PyObject *args)
Py_DECREF(copy);
Py_DECREF(init);
}
else if(HasInstDict(self) && (dict=INSTANCE_DICT(self)))
else
{
PyErr_Clear();
if(HasInstDict(self) && (dict=INSTANCE_DICT(self)))
{
PyDict_Clear(dict);
self->state=cPersistent_GHOST_STATE;
}
}
}
else
{
PyErr_Clear();
......@@ -940,7 +900,7 @@ void
initcPersistence()
{
PyObject *m, *d;
char *rev="$Revision: 1.19 $";
char *rev="$Revision: 1.20 $";
PATimeType.ob_type=&PyType_Type;
......@@ -967,6 +927,9 @@ initcPersistence()
/****************************************************************************
$Log: cPersistence.c,v $
Revision 1.20 1997/11/13 19:46:24 jim
Fixed minor error handling bug in reinit.
Revision 1.19 1997/09/18 19:53:46 jim
Added attribute, _p_state.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7