On Tue, Sep 7, 2010 at 1:45 PM, Worley, Dale R (Dale) <[email protected]> wrote:
> By now, Al has attached this patch to XX-8474 as "19051-19065.diff". It is
> based on 4.2 (in Avaya's repository, which isn't quite the same as whatever
> SIPfoundry is using). It does contain some significant revisions of Hoa's
> work, and is not the same as Hoa's latest version. (And all of Hoa's
> versions are based on 4.3.)
Unfortunately I cannot apply this patch because the sources have
deviated too much at this point.
As just one example, in the patch 19051-19065.diff, we see a diff on a
function we do not even have. We cannot even extrapolate avaya's
source because we're missing the beginning of some loop or
conditional, we only seen the closing bracket.
File: ResourceList.cpp
==========================================================================
// Delete a resource identified by position.
-void ResourceList::deleteResourceAt(size_t at)
+bool ResourceList::deleteResourceAt(size_t at)
{
+ bool resource_deleted = false;
+
OsSysLog::add(FAC_RLS, PRI_DEBUG,
"ResourceList::deleteResourceAt mUserPart = '%s', at
= %d",
mUserPart.data(), (int) at);
@@ -113,14 +115,22 @@
mChangesList.destroy(&uri);
// Delete the ResourceReference.
- delete resource;
+ resource_deleted = getResourceListSet()->getResourceCache().
+ destroyResourceReference(resource);
+
+ // Publish the change.
+ setToBePublished();
}
+
+ return resource_deleted;
}
==========================================================================
> I would have liked to merge the various parts into the SIPfoundry Subversion
> repository as separate revisions, but that's not being maintained anymore, so
> I had to produce a diff. In that context, it wasn't worth the hassle of
> separating all the bits into different patches.
There was only 1 functional change to sipXrls 4.3 (or otherwise) and
that was made by Hoa so what's in SIPfoundry subversion would be fine
place to merge from in this case.
_______________________________________________
sipx-dev mailing list
[email protected]
List Archive: http://list.sipfoundry.org/archive/sipx-dev/
