From fb41eba02cccd134e1da581cee05ec1537d6a059 Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 21 Mar 2012 17:57:39 +0400 Subject: [PATCH] SVN: correctly report inner working copy root to the system (++ null checks) --- .../org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java index 934b103213a2..110329c8c78b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java @@ -177,14 +177,15 @@ public class SvnRecursiveStatusWalker { if (! myMetCurrentItem && myCurrentItem.isIsInnerCopyRoot()) { myMetCurrentItem = true; final SVNStatus statusInner = SvnUtil.getStatus(SvnVcs.getInstance(myProject), myCurrentItem.getPath().getIOFile()); + if (statusInner == null) return; final SVNStatusType status = statusInner.getNodeStatus(); if (SVNStatusType.OBSTRUCTED.equals(status) || SVNStatusType.STATUS_IGNORED.equals(status) || - SVNStatusType.STATUS_NONE.equals(status) || SVNStatusType.STATUS_UNVERSIONED.equals(status) || - SVNStatusType.UNKNOWN.equals(status)) { + SVNStatusType.STATUS_NONE.equals(status) || SVNStatusType.STATUS_UNVERSIONED.equals(status) || + SVNStatusType.UNKNOWN.equals(status)) { return; } - if (myCurrentItem.getPath().getVirtualFile() != null || statusInner != null) { + if (myCurrentItem.getPath().getVirtualFile() != null) { myReceiver.processCopyRoot(myCurrentItem.getPath().getVirtualFile(), statusInner.getURL(), WorkingCopyFormat.getInstance(statusInner.getWorkingCopyFormat())); }