pegasus/src/Pegasus/Common/CIMObjectPath.cpp - diff

Return to CIMObjectPath.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/CIMObjectPath.cpp between version 1.67 and 1.74

version 1.67, 2007/11/30 18:48:55

version 1.74, 2008/12/02 09:00:43

Line 1

//%2006////////////////////////////////////////////////////////////////////////

//%LICENSE////////////////////////////////////////////////////////////////

// Licensed to The Open Group (TOG) under one or more contributor license

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with

// this work for additional information regarding copyright ownership.

// IBM Corp.; EMC Corporation, The Open Group.

// Each contributor licenses this file to you under the OpenPegasus Open

// Source License; you may not use this file except in compliance with the

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// License.

// EMC Corporation; VERITAS Software Corporation; The Open Group.

// EMC Corporation; Symantec Corporation; The Open Group.

// Permission is hereby granted, free of charge, to any person obtaining a copy

// Permission is hereby granted, free of charge, to any person obtaining a

// of this software and associated documentation files (the "Software"), to

// copy of this software and associated documentation files (the "Software"),

// deal in the Software without restriction, including without limitation the

// to deal in the Software without restriction, including without limitation

// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

// the rights to use, copy, modify, merge, publish, distribute, sublicense,

// sell copies of the Software, and to permit persons to whom the Software is

// and/or sell copies of the Software, and to permit persons to whom the

// furnished to do so, subject to the following conditions:

// Software is furnished to do so, subject to the following conditions:

// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN

// The above copyright notice and this permission notice shall be included

// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED

// in all copies or substantial portions of the Software.

// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

//==============================================================================

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

//////////////////////////////////////////////////////////////////////////

//%/////////////////////////////////////////////////////////////////////////////

Line 36

Line 34

#include <iostream>

#include "HashTable.h"

#include "CIMObjectPath.h"

#include "Indentor.h"

#include "CIMName.h"

#include "XmlWriter.h"

#include "CIMValue.h"

#include "XmlReader.h"

#include "ArrayInternal.h"

#include "HostLocator.h"

#include "System.h"

#include "CIMKeyBindingRep.h"

#include "CIMObjectPathRep.h"

PEGASUS_NAMESPACE_BEGIN

Line 139

Line 138

////////////////////////////////////////////////////////////////////////////////

class CIMKeyBindingRep

{

public:

CIMKeyBindingRep()

{

}

CIMKeyBindingRep(const CIMKeyBindingRep& x)

: _name(x._name), _value(x._value), _type(x._type)

{

}

CIMKeyBindingRep(

const CIMName& name,

const String& value,

CIMKeyBinding::Type type)

: _name(name), _value(value), _type(type)

{

}

~CIMKeyBindingRep()

{

}

CIMKeyBindingRep& operator=(const CIMKeyBindingRep& x)

{

if (&x != this)

{

_name = x._name;

_value = x._value;

_type = x._type;

}

return *this;

}

CIMName _name;

String _value;

CIMKeyBinding::Type _type;

};

CIMKeyBinding::CIMKeyBinding()

{

_rep = new CIMKeyBindingRep();

Line 224

Line 182

// case CIMTYPE_REAL32:

// case CIMTYPE_REAL64:

case CIMTYPE_OBJECT:

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

case CIMTYPE_INSTANCE:

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

// From PEP 194: EmbeddedObjects cannot be keys.

throw TypeMismatchException();

break;

Line 316

Line 272

// case CIMTYPE_REAL32:

// case CIMTYPE_REAL64:

case CIMTYPE_OBJECT:

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

case CIMTYPE_INSTANCE:

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

// From PEP 194: EmbeddedObjects cannot be keys.

return false;

break;

Line 409

Line 363

////////////////////////////////////////////////////////////////////////////////

class CIMObjectPathRep

{

public:

CIMObjectPathRep(): _refCounter(1)

{

}

CIMObjectPathRep(const CIMObjectPathRep& x)

: _refCounter(1), _host(x._host), _nameSpace(x._nameSpace),

_className(x._className), _keyBindings(x._keyBindings)

{

}

CIMObjectPathRep(

const String& host,

const CIMNamespaceName& nameSpace,

const CIMName& className,

const Array<CIMKeyBinding>& keyBindings)

: _refCounter(1), _host(host), _nameSpace(nameSpace),

_className(className), _keyBindings(keyBindings)

{

}

~CIMObjectPathRep()

{

}

CIMObjectPathRep& operator=(const CIMObjectPathRep& x)

{

if (&x != this)

{

_host = x._host;

_nameSpace = x._nameSpace;

_className = x._className;

_keyBindings = x._keyBindings;

}

return *this;

}

static Boolean isValidHostname(const String& hostname)

{

HostLocator addr(hostname);

return addr.isValid();

}

// reference counter as member to avoid

// virtual function resolution overhead

AtomicInt _refCounter;

// Contains port as well (e.g., myhost:1234).

String _host;

CIMNamespaceName _nameSpace;

CIMName _className;

Array<CIMKeyBinding> _keyBindings;

};

template<class REP>

inline void Ref(REP* rep)

{

Line 717

Line 612

p++;

Array<Uint8> keyValueUTF8;

Buffer keyValueUTF8(128);

keyValueUTF8.reserveCapacity(128);

while (*p && *p != '"')

{

Line 752

Line 646

type = CIMKeyBinding::STRING;

/* Performance shortcut will check for

equal sign instead of doing the full

CIMObjectPath creation and exception handling

if (strchr(keyValueUTF8.getData(), '='))

{

// found an equal sign, high probability for a reference

try

{

CIMObjectPath testForPath(valueString);

Line 766

Line 667

// Not a reference value; leave type as STRING

}

else if (toupper(*p) == 'T' || toupper(*p) == 'F')

{

type = CIMKeyBinding::BOOLEAN;

Legend:

Removed from v.1.67
changed lines
	Added in v.1.74

No CVS admin address has been configured