From ab67492caf2de98f6dca19d5f44ec699ed3d9dd8 Mon Sep 17 00:00:00 2001 From: irengrig Date: Thu, 29 Mar 2012 17:17:08 +0400 Subject: [PATCH] IDEA-83677 NPE at org.jetbrains.idea.svn.history.SvnHistoryProvider$MyLogEntryHandler.createRevision --- .../src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java index 776ab11bef5d..6be42139c560 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java @@ -625,7 +625,8 @@ public class SvnHistoryProvider implements VcsHistoryProvider, VcsCacheableHisto String message = logEntry.getMessage(); SVNRevision rev = SVNRevision.create(logEntry.getRevision()); // final SVNURL url = myRepositoryRoot.appendPath(myLastPath, true); - final SVNURL url = myRepositoryRoot.appendPath(entryPath.getPath(), true); + final SVNURL url = entryPath != null ? myRepositoryRoot.appendPath(entryPath.getPath(), true) : + myRepositoryRoot.appendPath(myLastPath, true); return new SvnFileRevision(myVcs, myPegRevision, rev, url.toString(), author, date, message, copyPath, myCharset); } }