Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 73705 Details for
Bug 196013
NPE in Execution Flow after Pause/Resume test
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
patch
bug196013_NPE_fix3.patch.txt (text/plain), 5.55 KB, created by
Eugene Chan
on 2007-07-12 17:52:57 EDT
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Eugene Chan
Created:
2007-07-12 17:52:57 EDT
Size:
5.55 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.hyades.trace.views >Index: src/org/eclipse/hyades/trace/views/internal/view/columnlabels/PackageNameColumnLabel.java >=================================================================== >RCS file: /cvsroot/tptp/trace/org.eclipse.hyades.trace.views/src/org/eclipse/hyades/trace/views/internal/view/columnlabels/PackageNameColumnLabel.java,v >retrieving revision 1.10 >diff -u -r1.10 PackageNameColumnLabel.java >--- src/org/eclipse/hyades/trace/views/internal/view/columnlabels/PackageNameColumnLabel.java 27 Oct 2005 18:34:02 -0000 1.10 >+++ src/org/eclipse/hyades/trace/views/internal/view/columnlabels/PackageNameColumnLabel.java 12 Jul 2007 21:53:13 -0000 >@@ -1,5 +1,5 @@ > /********************************************************************** >- * Copyright (c) 2005 IBM Corporation and others. >+ * Copyright (c) 2005, 2007 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -65,9 +65,12 @@ > return (TRCPackage)element; > if (element instanceof TRCClass) > return ((TRCClass)element).getPackage(); >- if (element instanceof TRCMethod) >- return ((TRCMethod)element).getDefiningClass().getPackage(); >- >+ if (element instanceof TRCMethod) { >+ if (((TRCMethod) element).getDefiningClass() != null) >+ return ((TRCMethod) element).getDefiningClass().getPackage(); >+ else >+ return null; >+ } > if (element instanceof TRCObjectReference) > { > TRCObjectReference ref = (TRCObjectReference)element; >Index: src/org/eclipse/hyades/trace/views/adapter/internal/MethodDetailsTab.java >=================================================================== >RCS file: /cvsroot/tptp/trace/org.eclipse.hyades.trace.views/src/org/eclipse/hyades/trace/views/adapter/internal/MethodDetailsTab.java,v >retrieving revision 1.5 >diff -u -r1.5 MethodDetailsTab.java >--- src/org/eclipse/hyades/trace/views/adapter/internal/MethodDetailsTab.java 1 Nov 2006 18:13:30 -0000 1.5 >+++ src/org/eclipse/hyades/trace/views/adapter/internal/MethodDetailsTab.java 12 Jul 2007 21:53:13 -0000 >@@ -1,5 +1,5 @@ > /********************************************************************** >- * Copyright (c) 2006 Intel Corporation. >+ * Copyright (c) 2006, 2007 Intel Corporation. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -158,26 +158,25 @@ > else if(selection instanceof TRCMethodInvocation) > method = ((TRCMethodInvocation)selection).getMethod(); > >- if(method != null) >- { >- String packName = method.getDefiningClass().getPackage().getName(); >- if(packName.length() > 0) >- { >- methodName.append(": ").append(packName).append(".") >- .append(method.getDefiningClass().getName()).append(".") >- .append(method.getName()).append(method.getSignature()); >- >+ if (method != null) { >+ String className = ""; >+ String packName = ""; >+ if (method.getDefiningClass() != null) { >+ className = method.getDefiningClass().getName(); >+ if (method.getDefiningClass().getPackage() != null) >+ packName = method.getDefiningClass().getPackage().getName(); > } >- else >- { >- methodName.append(": ").append(packName) >- .append(method.getDefiningClass().getName()).append(".") >- .append(method.getName()).append(method.getSignature()); >+ if (packName.length() > 0) { >+ methodName.append(": ").append(packName).append(".") >+ .append(className).append(".") >+ .append(method.getName()).append(method.getSignature()); >+ } else { >+ methodName.append(": ") >+ .append(className).append(".") >+ .append(method.getName()).append(method.getSignature()); > } > } >- } >- else >- { >+ } else { > methodName.append(": ").append(TraceUIMessages._171); > } > >Index: src/org/eclipse/hyades/trace/views/internal/MultiLevelStatisticView.java >=================================================================== >RCS file: /cvsroot/tptp/trace/org.eclipse.hyades.trace.views/src/org/eclipse/hyades/trace/views/internal/MultiLevelStatisticView.java,v >retrieving revision 1.11 >diff -u -r1.11 MultiLevelStatisticView.java >--- src/org/eclipse/hyades/trace/views/internal/MultiLevelStatisticView.java 21 Sep 2006 19:19:29 -0000 1.11 >+++ src/org/eclipse/hyades/trace/views/internal/MultiLevelStatisticView.java 12 Jul 2007 21:53:13 -0000 >@@ -1,5 +1,5 @@ > /********************************************************************** >- * Copyright (c) 2005, 2006 IBM Corporation, Intel Corporation. >+ * Copyright (c) 2005, 2007 IBM Corporation, Intel Corporation. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -411,7 +411,8 @@ > } else if (obj instanceof TRCMethod) { > meth = (TRCMethod) obj; > cls = meth.getDefiningClass(); >- pack = cls.getPackage(); >+ if (null != cls) >+ pack = cls.getPackage(); > } > else if (obj instanceof TRCObject) > { >@@ -422,7 +423,8 @@ > else if(obj instanceof TRCMethodInvocation) > { > cls = PerftraceUtil.getClass((TRCMethodInvocation)obj); >- pack = cls.getPackage(); >+ if (null != cls) >+ pack = cls.getPackage(); > } > > searchInLevel(tree,
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 196013
:
73514
|
73558
|
73559
|
73574
|
73648
| 73705