From 11906ffd21d870f42b2afe912a820a2a2edf0e19 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Wed, 8 Feb 2012 00:55:37 +0400
Subject: [PATCH] fix PropertyDescriptor.copy

it fails in certain situation, breaks test added in following commit
---
 .../jet/lang/descriptors/PropertySetterDescriptor.java         | 3 ---
 .../src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java
index 24930919768..8a64c457b48 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java
@@ -24,9 +24,6 @@ public class PropertySetterDescriptor extends PropertyAccessorDescriptor {
             boolean hasBody,
             boolean isDefault) {
         super(modality, visibility, correspondingProperty, annotations, "set-" + correspondingProperty.getName(), hasBody, isDefault);
-        if (isDefault) {
-            initializeDefault();
-        }
     }
 
     public void initialize(@NotNull ValueParameterDescriptor parameter) {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
index 4680867e228..180672d2388 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
@@ -730,6 +730,7 @@ public class DescriptorResolver {
                 propertyDescriptor, Collections.<AnnotationDescriptor>emptyList(), propertyDescriptor.getModality(),
                 propertyDescriptor.getVisibility(),
                 false, true);
+        setterDescriptor.initializeDefault();
         return setterDescriptor;
     }